bug修改,单据补单未添加仓库号问题

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java

@@ -110,6 +110,12 @@ public class BasicThirdSysController {
                     return ResultVOUtils.error(500, "至少需需用一个第三方系统！");
                 }
             }
+
+            if (temp.getMainSys() && !temp.getEnabled()) {
+                return ResultVOUtils.error(500, "主系统必须启用");
+            }
+
+
             if (temp.getMainSys() != basicThirdSysEntity.getMainSys()) {
                 if (udiRelevanceService.isExit() || unitMaintainService.isExit()) {
                     return ResultVOUtils.error(999, "设置主系统失败");

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java

@@ -109,6 +109,11 @@ public class BussinessOriginTypeController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         if (bussinessTypeEntity != null) {
+            BussinessOriginTypeEntity bussinessOriginTypeEntity = bussinessOriginTypeService.findByAction(bussinessTypeEntity.getAction());
+            if (bussinessOriginTypeEntity != null) {
+                return ResultVOUtils.error(500, "单据类型已存在！");
+            }
+
             bussinessOriginTypeService.insertBusOriginType(bussinessTypeEntity);
         } else {
             return ResultVOUtils.error(999, "参数错误");

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

@@ -105,6 +105,11 @@ public class UdiTraceController {
                     udiTraceResponse.setCpmctymc(finalUdiRelevance.getCpmctymc());
                     udiTraceResponse.setGgxh(finalUdiRelevance.getGgxh());
                     udiTraceResponse.setOrderId(item.getId());
+                    InvProductDetailEntity invProductDetailEntity = invProductDetailEntities.get(0);
+                    udiTraceResponse.setBatchNo(invProductDetailEntity.getBatchNo());
+                    udiTraceResponse.setProduceDate(invProductDetailEntity.getProductionDate());
+                    udiTraceResponse.setExpireDate(invProductDetailEntity.getExpireDate());
+                    udiTraceResponse.setCount(invProductDetailEntity.getCount());
                 }
                 return udiTraceResponse;
             }).collect(Collectors.toList());

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

@@ -598,6 +598,7 @@ public class InvProductsTrService {
             outOrder.setFromCorp(basicUnitMaintainEntity.getName());
             outOrder.setFromCorpId(corpName);
             outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
+            outOrder.setInvStorageCode(orderEntity.getInvStorageCode());
             outOrder.setCorpOrderId(CustomUtil.getId() + "x");
             //互填单号
             orderEntity.setUllageSupNo(outOrder.getId());
@@ -644,7 +645,7 @@ public class InvProductsTrService {
             outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID);
             outOrder.setFromCorpId(null);
             outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
-
+            outOrder.setInvStorageCode(orderEntity.getInvStorageCode());
             //互填单号
             orderEntity.setUllageSupNo(outOrder.getId());
             orderEntity.setUpdateTime(new Date());
@@ -720,7 +721,7 @@ public class InvProductsTrService {
 
             outOrder.setCorpOrderId(CustomUtil.getId() + "x");
             outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
-
+            outOrder.setInvStorageCode(orderEntity.getLocStorageCode());
 
             SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit");
             if ("1".equals(systemParamConfigEntity.getParamValue())) {
@@ -800,6 +801,7 @@ public class InvProductsTrService {
             outOrder.setFromCorpId(temps.get(0).getFromCorpId());
             outOrder.setCorpOrderId(CustomUtil.getId() + "x");
             outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
+            outOrder.setInvStorageCode(orderEntity.getInvStorageCode());
             outOrder.setErpFk(null);
             outOrder.setFromType(ConstantStatus.FROM_CHANGE);
             outOrder.setReceiveStatus(0);

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -34,7 +34,7 @@
                              receiveStatus, erpFk, stockCheckFk, customerId, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-                             fromSubInvCode, createTime)
+                             fromSubInvCode, createTime,invStorageCode)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -54,7 +54,7 @@
                 #{stockCheckFk},
                 #{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
                 #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
-                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime})
+                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime},#{invStorageCode})
     </insert>
 
 
@@ -65,7 +65,7 @@
                               fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                               receiveStatus, erpFk, stockCheckFk, customerId, supId,
                               exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime)
+                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,invStorageCode)
         values (
         #{id},
         #{action},
@@ -99,7 +99,7 @@
         #{replicateNo},
         #{invWarehouseCode},
         #{fromSubInvCode},
-        #{createTime}
+        #{createTime},#{invStorageCode}
         )
     </insert>
 

api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml

@@ -299,7 +299,7 @@
 
     <delete id="deleteByOrderId">
         delete
-        from inv_product_detail
+        from inv_prein_product_detail
         where orderIdFk = #{orderIdFk}
     </delete>