单据领料问题修改

src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/OutLineController.java

@@ -533,13 +533,6 @@ public class OutLineController {
                     barcode.setStorageId(null);
                     barcodeManager.save(barcode);
                 }
-
-
-                StoragePos pos = BoxHandleUtil.locOnePos(pidBarcode);
-                if (pos != null) {
-                    pos.setBarcode(pidBarcode);
-                    storagePosManager.save(pos);
-                }
             } else {
                 if (subCodes != null && !subCodes.isEmpty()) {
                     //获取到需要出库的物料,进行更改
@@ -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) {
                 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 {
 
     @ApiOperation("拉取单据信息")
     @RequestMapping("/fetchTicket")
-    @AnonymousAccess
+    //@AnonymousAccess
     public ResultBean fetchTicket(String ticket) {
 
         if (StringUtils.isEmpty(ticket)) {
@@ -70,7 +70,7 @@ public class TicketController {
 
     @ApiOperation("单据领料")
     @RequestMapping("/checkOut")
-    @AnonymousAccess
+    //@AnonymousAccess
     public synchronized ResultBean checkOut(String ticket) {
 
         String resultStr = liteOrderCache.hasExecutingOrder();
@@ -127,7 +127,7 @@ public class TicketController {
 
     @ApiOperation("单据退料")
     @RequestMapping("/ticketReturn")
-    @AnonymousAccess
+    //@AnonymousAccess
     public ResultBean ticketReturn(@RequestBody Map<String, String> paramMap) {
 
         String ticket = paramMap.get("ticket");   //单据号
@@ -195,7 +195,7 @@ public class TicketController {
 
     @ApiOperation("单据退料料串绑定信息")
     @RequestMapping("/ticketReturnMaterialInfo")
-    @AnonymousAccess
+    //@AnonymousAccess
     public ResultBean ticketReturnMaterialInfo() {
         Map<String, TicketReturn> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_TICKET_RETURN);
         if (cacheMap == null) {
@@ -207,7 +207,7 @@ public class TicketController {
 
     @ApiOperation("单据退料移除料串绑定信息")
     @RequestMapping("/ticketReturnRemoveMaterialInfo")
-    @AnonymousAccess
+    //@AnonymousAccess
     public ResultBean ticketReturnRemoveMaterialInfo(String materialStr) {
         Map<String, TicketReturn> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_TICKET_RETURN);
         if (cacheMap == null) {
@@ -221,7 +221,7 @@ public class TicketController {
 
     @ApiOperation("单据转库")
     @RequestMapping("/ticketTransfer")
-    @AnonymousAccess
+    //@AnonymousAccess
     public ResultBean ticketTransfer(@RequestBody Map<String, String> paramMap) {
         String ticket = paramMap.get("ticket");   //单据号
         String materialStr = paramMap.get("materialStr");  //料串
@@ -291,7 +291,7 @@ public class TicketController {
 
     @ApiOperation("单据转库返回结果")
     @RequestMapping("/ticketTransferResult")
-    @AnonymousAccess
+    //@AnonymousAccess
     public ResultBean ticketTransferResult() {
         Map<String, TicketReturn> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_TICKET_TRANSFER);
         if (cacheMap == null) {
@@ -303,7 +303,7 @@ public class TicketController {
 
     @ApiOperation("单据退料移除料串绑定信息")
     @RequestMapping("/ticketTransferRemoveMaterialInfo")
-    @AnonymousAccess
+    //@AnonymousAccess
     public ResultBean ticketTransferRemoveMaterialInfo(String materialStr) {
         Map<String, TicketReturn> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_TICKET_TRANSFER);
         if (cacheMap == null) {