Merge branch 'master' of http://112.4.208.194:3000/FeiDaBaoKai/wms_serve_xugongteji

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java

@@ -201,8 +201,9 @@ public class TaskExecutor {
                 }
                 for (AppPendingStorage pendingStorage : appPendingStorages) {
                     // 插入库存
+                    String stockId = IdUtils.fastSimpleUUID();
                     AppStock appStock = new AppStock();
-                    appStock.setStockId(IdUtils.fastSimpleUUID());
+                    appStock.setStockId(stockId);
                     appStock.setListId(pendingStorage.getListId());
                     appStock.setVehicleId(pendingStorage.getVehicleNo());
                     appStock.setLocationId(task.getDestination());
@@ -230,7 +231,7 @@ public class TaskExecutor {
                         if(pendingStorage.getStorageType().compareTo(2) == 0) {
                             PmsInFeedBack pmsInFeedBack = new PmsInFeedBack();
                             PmsInComplete pmsInComplete = new PmsInComplete();
-                            pmsInComplete.setCrmOrder(pendingStorage.getListId());
+                            pmsInComplete.setCrmOrder(stockId);
                             pmsInComplete.setSapCode("2290");
                             pmsInComplete.setInArea("TPLK");
                             pmsInComplete.setInLocation("6001");