修复单据流转缺量补单和全量补单问题，修复平衡补单问题

api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java

@@ -441,8 +441,6 @@ public class OrderController {
         } else {
             supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL);        //设置状态为补录单据
         }
-
-
         supplementOrder.setExportStatus(0);  //设置导出状态为未导出
         supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验
         supplementOrder.setReceiveStatus(0); //设置验收状态为未验收
@@ -478,13 +476,10 @@ public class OrderController {
                 }
         );
         //更新数据
-        try {
+        orderDao.insertOrder(supplementOrder);
-            orderDao.insertOrder(supplementOrder);
+        orderEntity.setUllageSupNo(supplementOrder.getId());
-            orderEntity.setUllageSupNo(supplementOrder.getId());
+        orderDao.updateOrder(orderEntity);
-            orderDao.updateOrder(orderEntity);
+        codesTempDao.insertCodesTemp(supplementCodes);
-            codesTempDao.insertCodesTemp(supplementCodes);
-        } catch (Exception e) {
-        }
     }
 
 

api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java

@@ -308,20 +308,17 @@ public class OrderServiceImpl implements OrderService {
         } else {
             supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL);        //设置状态为补录单据
         }
-        String name = invWarehouseDao.getNameByCode(supplementOrder.getInvStorageCode());
+
         supplementOrder.setExportStatus(0);  //设置导出状态为未导出
         supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验
         supplementOrder.setReceiveStatus(0); //设置验收状态为未验收
         supplementOrder.setCorpOrderId(CustomUtil.getId() + "x");
         //修改往来单位及当前库存号
-        supplementOrder.setFromCorpId(order.getInvWarehouseCode());
+        supplementOrder.setFromCorpId(order.getLocStorageCode());
-        supplementOrder.setFromCorp(name);
         supplementOrder.setFromSubInvCode(order.getInvWarehouseCode());
-        supplementOrder.setLocStorageCode(order.getSubInvCode());
+        supplementOrder.setLocStorageCode(order.getFromCorpId());
-        supplementOrder.setSubInvCode(order.getInvStorageCode());
         supplementOrder.setInvWarehouseCode(null);
-        supplementOrder.setInvStorageCode(order.getSubInvCode());
+        String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId());
-
         if (StrUtil.isNotEmpty(order.getFromSubInvCode())) {
             supplementOrder.setInvWarehouseCode(order.getFromSubInvCode());
         } else {
@@ -331,14 +328,14 @@ public class OrderServiceImpl implements OrderService {
             }
         }
 
+
+        supplementOrder.setFromCorp(name);
         supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE);
 
         BussinessTypeEntity supplementType = bussinessTypeDao.selectByAction(bussinessTypeEntity.getSupplementOrderType());
         supplementOrder.setMainAction(supplementType.getMainAction());
         supplementOrder.setAction(supplementType.getAction());
         supplementOrder.setErpFk(null);
-//        String time = DateUtil.getBeforeMinute(supplementOrder.getActDate(), 5);
-//        supplementOrder.setActDate(time);
 
         //复制码表
         List<WarehouseEntity> codes = codesDao.findByReceiptId(order.getId());
@@ -374,6 +371,7 @@ public class OrderServiceImpl implements OrderService {
         return ResultVOUtils.success();
     }
 
+
     @Override
     public List<StockOrderResponse> checkSupplementOrder(List<StockOrderEntity> stockOrderEntityList) {
         if (CollUtil.isEmpty(stockOrderEntityList)) {

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

@@ -210,7 +210,7 @@ public class InvProductsTrService {
 
             //单据流转
             BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeService.findOriginAction(bussinessLocalTypeEntity.getLocalAction());
-            if (bussinessChangeTypeEntity != null && bussinessLocalTypeEntity.isChangeEnable()) {
+            if (bussinessChangeTypeEntity != null) {
 
                 addUseOutOrder(orderEntity, mInvProductDetailEntities, bussinessChangeTypeEntity);
 
@@ -263,9 +263,12 @@ public class InvProductsTrService {
                 }
             } else {
                 if (locWarehouseEntity.getLevel() > 1) {
+
+                    InvSubWarehouseEntity subWarehouseEntity = invSubWarehouseService.findByInvSubByCode(bussinessChangeTypeEntity.getDefaultSubInv());
                     for (WarehouseEntity tempEntity : warehouseEntities) {
-                        tempEntity.setFromCorp(bussinessChangeTypeEntity.getDefaultInv());
+                        tempEntity.setFromCorp(subWarehouseEntity.getName());
-                        tempEntity.setFromCorpId(bussinessChangeTypeEntity.getDefaultSubInv());
+                        tempEntity.setFromCorpId(subWarehouseEntity.getParentId());
+                        tempEntity.setFromSubInvCode(subWarehouseEntity.getCode());
                         inList.add(tempEntity);
                     }
                 } else {
@@ -320,7 +323,7 @@ public class InvProductsTrService {
                                 preiInList.add(warehouseEntity);
                             } else if (warehouseEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量
                                 int lea = count - invCount;
-                                warehouseEntity.setCount(lea / (actCount));
+                                warehouseEntity.setCount(lea / (actCount));  //
                                 preiInList.add(warehouseEntity);
                             }
                         }

api-admin/src/main/resources/application-dev.properties

@@ -1,8 +1,8 @@
 server.port=9992
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3364/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph1?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-spring.datasource.password=Glxp@6066
+spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000
 spring.datasource.hikari.maximum-pool-size=60
 spring.datasource.hikari.minimum-idle=10