补单时间问题，业务单据生成与UDI管理系统重复问题

api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java

@@ -1,6 +1,7 @@
 package com.glxp.sale.admin.thread;
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.db.sql.Order;
 import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.constant.ConstantType;
 import com.glxp.sale.admin.entity.basic.*;
@@ -513,7 +514,7 @@ public class InvProductsTrService {
         //寄售出库生成单据
         OrderEntity outOrder = new OrderEntity();
         BeanUtils.copyProperties(orderEntity, outOrder);
-        outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime()));
+        outOrder.setActDate(DateUtil.getBeforeDay(fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime()));
         outOrder.setCreateTime(outOrder.getActDate());
         outOrder.setAction(bussinessChangeTypeEntity.getScAction());
         outOrder.setMainAction(ConstantType.TYPE_OUT);
@@ -584,7 +585,7 @@ public class InvProductsTrService {
             temps = filterSupMaps.get(corpName);
             OrderEntity outOrder = new OrderEntity();
             BeanUtils.copyProperties(orderEntity, outOrder);
-            outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime()));
+            outOrder.setActDate(DateUtil.getBeforeDay(fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime()));
             outOrder.setCreateTime(outOrder.getActDate());
             outOrder.setAction(bussinessChangeTypeEntity.getScAction());
             outOrder.setMainAction(ConstantType.TYPE_PUT);
@@ -632,7 +633,7 @@ public class InvProductsTrService {
         for (WarehouseEntity warehouseEntity : unkonwCorpList) {
             OrderEntity outOrder = new OrderEntity();
             BeanUtils.copyProperties(orderEntity, outOrder);
-            outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime()));
+            outOrder.setActDate(DateUtil.getBeforeDay(fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime()));
             outOrder.setCreateTime(outOrder.getActDate());
             outOrder.setAction(bussinessChangeTypeEntity.getScAction());
             outOrder.setMainAction(ConstantType.TYPE_PUT);
@@ -706,7 +707,7 @@ public class InvProductsTrService {
             OrderEntity outOrder = new OrderEntity();
             BeanUtils.copyProperties(orderEntity, outOrder);
             outOrder.setSupplementNo(null);//补单需置空
-            outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime()));
+            outOrder.setActDate(DateUtil.getBeforeDay(fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime()));
             outOrder.setCreateTime(outOrder.getActDate());
             outOrder.setAction(bussinessChangeTypeEntity.getScAction());
             outOrder.setMainAction(ConstantType.TYPE_PUT);
@@ -789,7 +790,7 @@ public class InvProductsTrService {
             temps = filterSupMaps.get(corpName);
             OrderEntity outOrder = new OrderEntity();
             BeanUtils.copyProperties(orderEntity, outOrder);
-            outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime()));
+            outOrder.setActDate(DateUtil.getBeforeDay(fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime()));
             outOrder.setCreateTime(outOrder.getActDate());
             outOrder.setAction(bussinessChangeTypeEntity.getScAction());
             outOrder.setMainAction(ConstantType.TYPE_PUT);
@@ -1149,4 +1150,17 @@ public class InvProductsTrService {
         } else return false;
     }
 
+
+    String fromDate(OrderEntity orderEntity) {
+        String time = "";
+        if (orderEntity.getAuditTime() != null) {
+            time = DateUtil.formatDateTime(orderEntity.getAuditTime());
+        } else {
+            time = orderEntity.getActDate();
+        }
+
+
+        return time;
+    }
+
 }

api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java

@@ -9,11 +9,11 @@ public class Constant {
     public static final String SERIAL_CACHE_PREFIX_ST = "serialst_";
     public static final String SERIAL_CACHE_SYNC_UDI = "syncUdi";
 
-    public static final String SCAN_ORDER = "MS";
-    public static final String BUS_ORDER = "MY";
-    public static final String LIN_YONG = "ML";
-    public static final String SG_ORDER = "SG";
-    public static final String JH_ORDER = "JH";
+    public static final String SCAN_ORDER = "ZS";
+    public static final String BUS_ORDER = "ZY";
+    public static final String LIN_YONG = "ZL";
+    public static final String SG_ORDER = "ZSG";
+    public static final String JH_ORDER = "ZJH";
     public static final String NBM_ORDER = "NBM";