Merge remote-tracking branch 'origin/master'

sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageBomServiceImpl.java

@@ -154,8 +154,8 @@ public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMappe
             String code = inOutStorageErpExportVo.getDocCode() + format + String.format("%04d", codeNum);
             inOutStorageErpExportVo.setCode(code);
             inOutStorageErpExportVo.setCreateTime(DateUtil.format(inOutStorage.getInOutStorageTime(), "yyyy/MM/dd HH:mm:ss"));
-            inOutStorageErpExportVo.setDeptCode("GPIT");
-            inOutStorageErpExportVo.setEmployeeCode("GPIT02");
+            inOutStorageErpExportVo.setDeptCode("STWH");
+            inOutStorageErpExportVo.setEmployeeCode("SKWH002");
 
             inOutStorageErpExportVoList.add(inOutStorageErpExportVo);
         }

sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryFinishedOrderServiceImpl.java

@@ -189,7 +189,13 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
         // 生成入库单
         for (OutboundOrder outboundOrder : outboundOrderMap.values()) {
             Date outboundTime = outboundOrder.getOutboundTime();
-            Long format = Long.parseLong(DateUtil.format(outboundTime, "MMddHH"));
+            int num;
+            if (Objects.equals("T007", outboundOrder.getStorageCode())) {
+                num = 33;
+            } else {
+                num = 66;
+            }
+            Long format = Long.parseLong(DateUtil.format(outboundTime, num + "MMddHH"));
             if (codeMap.get(format) != null) {
                 continue;
             }
@@ -201,20 +207,14 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
 
             // 生成单号，后四位生成规则，取系统单号 dd01
             // 生成e10入库单号后四位，当前天数+num 防止与bom入库导出单号重复
-            int num;
-            if (Objects.equals("T007", outboundOrder.getStorageCode())) {
-                num = 30;
-            } else {
-                num = 60;
-            }
             int day = DateUtil.dayOfMonth(outboundTime);
             int hour = DateUtil.hour(outboundTime, true);
             int codeNum = Integer.parseInt((day + num) + String.format("%02d", hour));
             String code = inOutStorageErpExportVo.getDocCode() + DateUtil.format(outboundTime, "-yyyyMM") + String.format("%04d", codeNum);
             inOutStorageErpExportVo.setCode(code);
             inOutStorageErpExportVo.setCreateTime(DateUtil.format(outboundTime, "yyyy/MM/dd HH:mm:ss"));
-            inOutStorageErpExportVo.setDeptCode("GPIT");
-            inOutStorageErpExportVo.setEmployeeCode("GPIT02");
+            inOutStorageErpExportVo.setDeptCode("STWH");
+            inOutStorageErpExportVo.setEmployeeCode("SKWH002");
 
             codeMap.put(inOutStorageErpExportVo.getId(), code);
             inOutStorageErpExportVoList.add(inOutStorageErpExportVo);
@@ -245,7 +245,13 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
                     if (outboundOrder == null || skuSpec == null) {
                         return inOutStorageBomErpExportVo;
                     }
-                    inOutStorageBomErpExportVo.setCode(codeMap.get(Long.parseLong(DateUtil.format(outboundOrder.getOutboundTime(), "MMddHH"))));
+                    int num;
+                    if (Objects.equals("T007", outboundOrder.getStorageCode())) {
+                        num = 33;
+                    } else {
+                        num = 66;
+                    }
+                    inOutStorageBomErpExportVo.setCode(codeMap.get(Long.parseLong(DateUtil.format(outboundOrder.getOutboundTime(), num + "MMddHH"))));
                     OrderInfo orderInfo = orderInfoMap.get(outboundOrder.getOrderWlnCode());
                     if (orderInfo == null) {
                         return inOutStorageBomErpExportVo;