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

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

@@ -260,8 +260,8 @@ public class OrderController {
         if (stockOrderEntity == null || stockOrderEntity.getOrderIdFk() == null) {
 
 
-            SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("sps_sync_review_order");
-//            if (systemParamConfigEntity.getParamValue().equals("1")) {
+//            SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("sps_sync_review_order");
+
             if (bussinessTypeEntity.isEntrutSpms()) {
                 BaseResponse baseResponse = spsDirectClient.downloadOrder(orderFilterRequest.getOrderId(), userId + "", orderFilterRequest.getAction());
                 return baseResponse;
@@ -271,9 +271,7 @@ public class OrderController {
             return ResultVOUtils.error(500, "非" + bussinessTypeEntity.getName() + "类型单据！");
         } else if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_CHECKED)) {
             if (StrUtil.isNotEmpty(stockOrderEntity.getLocStorageCode())) {
-                InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderEntity.getLocStorageCode());
                 List<WarehouseUserEntity> warehouseUserEntities = new ArrayList<>();
-                List<InvWarehouseEntity> invWarehouseEntities = new ArrayList<>();
                 if (StrUtil.isNotEmpty(stockOrderEntity.getInvWarehouseCode())) {
                     FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
                     filterInvUserRequest.setCode(stockOrderEntity.getInvWarehouseCode());
@@ -283,7 +281,6 @@ public class OrderController {
                     FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
                     filterInvWarehouseRequest.setCode(stockOrderEntity.getLocStorageCode());
                     filterInvWarehouseRequest.setUserId(userId);
-                    invWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest);
                 }
 
 

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

@@ -104,6 +104,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/api/admin/thread/InvProductsTrService.java

@@ -593,6 +593,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());
@@ -639,6 +640,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());
@@ -713,7 +715,7 @@ public class InvProductsTrService {
 
             outOrder.setCorpOrderId(CustomUtil.getId() + "x");
             outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
-
+            outOrder.setInvStorageCode(orderEntity.getInvStorageCode());
 
             SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit");
             if ("1".equals(systemParamConfigEntity.getParamValue())) {
@@ -793,6 +795,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, thirdBillNo, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-                             fromSubInvCode, createTime, originFromType)
+                             fromSubInvCode, createTime, originFromType,invStorageCode)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -54,7 +54,7 @@
                 #{stockCheckFk},
                 #{thirdBillNo}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
                 #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
-                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType})
+                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType},#{invStorageCode})
     </insert>
 
     <insert id="importOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.inout.OrderEntity">
@@ -64,7 +64,7 @@
                               fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                               receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
                               exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType)
+                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType,invStorageCode)
         values (
         #{id},
         #{action},
@@ -99,7 +99,7 @@
         #{invWarehouseCode},
         #{fromSubInvCode},
         #{createTime},
-        #{originFromType}
+        #{originFromType},#{invStorageCode}
         )
     </insert>
 

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

@@ -229,7 +229,8 @@
     </delete>
 
     <delete id="deleteByOrderId">
-        delete from inv_prein_product_detail
+        delete
+        from inv_prein_product_detail
         where orderIdFk = #{orderIdFk}
     </delete>
 
@@ -290,12 +291,5 @@
 
     </select>
 
-    <delete id="deleteByOrderId">
-        delete
-        from inv_product_detail
-        where orderIdFk = #{orderIdFk}
-    </delete>
-
-
 
 </mapper>