1.311转库,取目的库别

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -1534,7 +1534,8 @@ public class LiteOrderCache {
                     }
                     }
                 }
                 }
                 if (pos == null) {
                 if (pos == null) {
-                    pos = storagePosManager.findPartNumberInStorages(storageIdList, pn, excludePosIds, checkoutType, orderItem.getBrand(), orderItem.getWarehouseCode());
+                    log.info(orderNo+"需要的库别为:"+orderItem.getSrcWarehouse());
+                    pos = storagePosManager.findPartNumberInStorages(storageIdList, pn, excludePosIds, checkoutType, orderItem.getBrand(), orderItem.getSrcWarehouse());
                 }
                 }
                 if (pos == null) {
                 if (pos == null) {
                     break;
                     break;

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/AgvDeviceController.java

@@ -149,14 +149,16 @@ public class AgvDeviceController {
                         String checkType = LiteorderCheckType.TICKET_TRANSFER_CHECKOUT + "";
                         String checkType = LiteorderCheckType.TICKET_TRANSFER_CHECKOUT + "";
                         if (checkType.equals(task.getSourceType())){
                         if (checkType.equals(task.getSourceType())){
                             TicketPickPostData data = new TicketPickPostData(task.getTicketCode(),task.getTicketItem(),Arrays.asList(task.getCartonId()));
                             TicketPickPostData data = new TicketPickPostData(task.getTicketCode(),task.getTicketItem(),Arrays.asList(task.getCartonId()));
-                            LuxsanApi.ticketPickPost(new TicketPickPostRequest(CommonUtil.plantCode, task.getTicketCode(), "SWC", Arrays.asList(data)));
+                            String result = LuxsanApi.ticketPickPost(new TicketPickPostRequest(CommonUtil.plantCode, task.getTicketCode(), "SWC", Arrays.asList(data)));
+                            if (StringUtils.isEmpty(result)) {
                                 Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
                                 Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
-                            if (barcode != null){
+                                if (barcode != null) {
                                     barcode.setWarehouseCode(task.getWarehouseCode());
                                     barcode.setWarehouseCode(task.getWarehouseCode());
                                     barcodeManager.save(barcode);
                                     barcodeManager.save(barcode);
                                 }
                                 }
                             }
                             }
                         }
                         }
+                    }
                 } else {
                 } else {
                     task.setStatus(statusStr);
                     task.setStatus(statusStr);
                     taskService.updateFinishedTask(task);
                     taskService.updateFinishedTask(task);