Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit fc7b2b26 由 zshaohui
选项

单据领料问题修改

1 个父辈 48c300a6
内嵌 并排
正在显示 2 个修改的文件 包含 16 行增加 和 15 行删除
src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/OutLineController.java
...@@ -533,13 +533,6 @@ public class OutLineController { ...@@ -533,13 +533,6 @@ public class OutLineController {
barcode.setStorageId(null); barcode.setStorageId(null);
barcodeManager.save(barcode); barcodeManager.save(barcode);
} }
StoragePos pos = BoxHandleUtil.locOnePos(pidBarcode);
if (pos != null) {
pos.setBarcode(pidBarcode);
storagePosManager.save(pos);
}
} else { } else {
if (subCodes != null && !subCodes.isEmpty()) { if (subCodes != null && !subCodes.isEmpty()) {
//获取到需要出库的物料,进行更改 //获取到需要出库的物料,进行更改
...@@ -587,6 +580,14 @@ public class OutLineController { ...@@ -587,6 +580,14 @@ public class OutLineController {
} }
} }
} }
pidBarcode = barcodeManager.save(pidBarcode);
StoragePos pos = BoxHandleUtil.locOnePos(pidBarcode);
if (pos != null) {
pos.setBarcode(pidBarcode);
storagePosManager.save(pos);
}
if (!isOut) { if (!isOut) {
return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不需要出库"); return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不需要出库");
} }
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/TicketController.java
...@@ -56,7 +56,7 @@ public class TicketController { ...@@ -56,7 +56,7 @@ public class TicketController {
@ApiOperation("拉取单据信息") @ApiOperation("拉取单据信息")
@RequestMapping("/fetchTicket") @RequestMapping("/fetchTicket")
@AnonymousAccess //@AnonymousAccess
public ResultBean fetchTicket(String ticket) { public ResultBean fetchTicket(String ticket) {
if (StringUtils.isEmpty(ticket)) { if (StringUtils.isEmpty(ticket)) {
...@@ -70,7 +70,7 @@ public class TicketController { ...@@ -70,7 +70,7 @@ public class TicketController {
@ApiOperation("单据领料") @ApiOperation("单据领料")
@RequestMapping("/checkOut") @RequestMapping("/checkOut")
@AnonymousAccess //@AnonymousAccess
public synchronized ResultBean checkOut(String ticket) { public synchronized ResultBean checkOut(String ticket) {
String resultStr = liteOrderCache.hasExecutingOrder(); String resultStr = liteOrderCache.hasExecutingOrder();
...@@ -127,7 +127,7 @@ public class TicketController { ...@@ -127,7 +127,7 @@ public class TicketController {
@ApiOperation("单据退料") @ApiOperation("单据退料")
@RequestMapping("/ticketReturn") @RequestMapping("/ticketReturn")
@AnonymousAccess //@AnonymousAccess
public ResultBean ticketReturn(@RequestBody Map<String, String> paramMap) { public ResultBean ticketReturn(@RequestBody Map<String, String> paramMap) {
String ticket = paramMap.get("ticket"); //单据号 String ticket = paramMap.get("ticket"); //单据号
...@@ -195,7 +195,7 @@ public class TicketController { ...@@ -195,7 +195,7 @@ public class TicketController {
@ApiOperation("单据退料料串绑定信息") @ApiOperation("单据退料料串绑定信息")
@RequestMapping("/ticketReturnMaterialInfo") @RequestMapping("/ticketReturnMaterialInfo")
@AnonymousAccess //@AnonymousAccess
public ResultBean ticketReturnMaterialInfo() { public ResultBean ticketReturnMaterialInfo() {
Map<String, TicketReturn> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_TICKET_RETURN); Map<String, TicketReturn> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_TICKET_RETURN);
if (cacheMap == null) { if (cacheMap == null) {
...@@ -207,7 +207,7 @@ public class TicketController { ...@@ -207,7 +207,7 @@ public class TicketController {
@ApiOperation("单据退料移除料串绑定信息") @ApiOperation("单据退料移除料串绑定信息")
@RequestMapping("/ticketReturnRemoveMaterialInfo") @RequestMapping("/ticketReturnRemoveMaterialInfo")
@AnonymousAccess //@AnonymousAccess
public ResultBean ticketReturnRemoveMaterialInfo(String materialStr) { public ResultBean ticketReturnRemoveMaterialInfo(String materialStr) {
Map<String, TicketReturn> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_TICKET_RETURN); Map<String, TicketReturn> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_TICKET_RETURN);
if (cacheMap == null) { if (cacheMap == null) {
...@@ -221,7 +221,7 @@ public class TicketController { ...@@ -221,7 +221,7 @@ public class TicketController {
@ApiOperation("单据转库") @ApiOperation("单据转库")
@RequestMapping("/ticketTransfer") @RequestMapping("/ticketTransfer")
@AnonymousAccess //@AnonymousAccess
public ResultBean ticketTransfer(@RequestBody Map<String, String> paramMap) { public ResultBean ticketTransfer(@RequestBody Map<String, String> paramMap) {
String ticket = paramMap.get("ticket"); //单据号 String ticket = paramMap.get("ticket"); //单据号
String materialStr = paramMap.get("materialStr"); //料串 String materialStr = paramMap.get("materialStr"); //料串
...@@ -291,7 +291,7 @@ public class TicketController { ...@@ -291,7 +291,7 @@ public class TicketController {
@ApiOperation("单据转库返回结果") @ApiOperation("单据转库返回结果")
@RequestMapping("/ticketTransferResult") @RequestMapping("/ticketTransferResult")
@AnonymousAccess //@AnonymousAccess
public ResultBean ticketTransferResult() { public ResultBean ticketTransferResult() {
Map<String, TicketReturn> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_TICKET_TRANSFER); Map<String, TicketReturn> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_TICKET_TRANSFER);
if (cacheMap == null) { if (cacheMap == null) {
...@@ -303,7 +303,7 @@ public class TicketController { ...@@ -303,7 +303,7 @@ public class TicketController {
@ApiOperation("单据退料移除料串绑定信息") @ApiOperation("单据退料移除料串绑定信息")
@RequestMapping("/ticketTransferRemoveMaterialInfo") @RequestMapping("/ticketTransferRemoveMaterialInfo")
@AnonymousAccess //@AnonymousAccess
public ResultBean ticketTransferRemoveMaterialInfo(String materialStr) { public ResultBean ticketTransferRemoveMaterialInfo(String materialStr) {
Map<String, TicketReturn> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_TICKET_TRANSFER); Map<String, TicketReturn> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_TICKET_TRANSFER);
if (cacheMap == null) { if (cacheMap == null) {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!