单据类型设置默认补单仓库问题

api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java

@@ -66,4 +66,5 @@ public class BussinessTypeEntity {
     private boolean vailInv;
     private boolean codeFillCheck;
     private String defaultSubInv;
+    private String defaultInv;
 }

api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java

@@ -68,4 +68,5 @@ public class BussinessTypResponse {
 
     private boolean codeFillCheck;
     private String defaultSubInv;
+    private String defaultInv;
 }

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

@@ -98,7 +98,7 @@ public class AsyncDiDlHelper {
 
         } catch (Exception e) {
             e.printStackTrace();
-            return ResultVOUtils.error(500, "系统繁忙！");
+            return ResultVOUtils.error(500, "连接UDI国家数据库下载出错！");
         }
     }
 }

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

@@ -700,13 +700,12 @@ public class InvProductsTrService {
             outOrder.setFromCorpId(corpName);
             outOrder.setFromCorp(temps.get(0).getFromCorp());
 
+
             BussinessTypeEntity originBT = bussinessTypeService.findBTByAction(orderEntity.getAction());
             if (StrUtil.isNotEmpty(originBT.getDefaultSubInv())) {
                 outOrder.setFromSubInvCode(originBT.getDefaultSubInv());
             }
-            if (StrUtil.isNotEmpty(bussinessTypeEntity.getDefaultSubInv())) {
-                outOrder.setFromSubInvCode(bussinessTypeEntity.getDefaultSubInv());
-            }
+
 
             outOrder.setCorpOrderId(CustomUtil.getId() + "x");
             outOrder.setLocStorageCode(orderEntity.getLocStorageCode());

api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml

@@ -19,7 +19,7 @@
         basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,
         basic_bussiness_type.secCheckBalacne, defaultUnit,basic_bustype_origin.action
         thirdAction,basic_bustype_origin.thirdSys,basic_bussiness_type.useDyCount,basic_bussiness_type.expireTip,basic_bussiness_type.prefix,basic_bustype_local.prefix
-        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv
+        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv
         FROM basic_bussiness_type LEFT JOIN basic_bustype_local
         on basic_bussiness_type.localAction = basic_bustype_local.action
         left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
@@ -133,7 +133,7 @@
         basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,defaultUnit,
         basic_bussiness_type.secCheckBalacne,basic_bustype_origin.action
         thirdAction,basic_bustype_origin.thirdSys,useDyCount,basic_bussiness_type.expireTip,basic_bussiness_type.prefix,basic_bustype_local.prefix
-        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv
+        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv
         FROM basic_bussiness_type LEFT JOIN basic_bustype_local
         on basic_bussiness_type.localAction = basic_bustype_local.action
         left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
@@ -187,7 +187,7 @@
         ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
         secCheckChange,corpType,basic_bussiness_type.storageCode,checkBalacne,
         secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix
-        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv)
+        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,defaultInv)
         values
             (
         #{action},
@@ -225,7 +225,7 @@
         #{prefix},
         #{ullageFill},
         #{scanPreIn},
-        #{vailInv},#{codeFillCheck},#{defaultSubInv}
+        #{vailInv},#{codeFillCheck},#{defaultSubInv},#{defaultInv}
         )
     </insert>
 
@@ -240,7 +240,7 @@
         checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
         ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
         secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix
-        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv)
+        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,defaultInv)
         values
             (
         #{index},
@@ -279,7 +279,7 @@
         #{prefix},
         #{ullageFill},
         #{scanPreIn},
-        #{vailInv},#{codeFillCheck},#{defaultSubInv}
+        #{vailInv},#{codeFillCheck},#{defaultSubInv},#{defaultInv}
         )
     </insert>
 
@@ -325,6 +325,7 @@
             <if test="prefix != null">prefix=#{prefix},</if>
             <if test="codeFillCheck != null">codeFillCheck=#{codeFillCheck},</if>
             <if test="defaultSubInv != null">defaultSubInv=#{defaultSubInv},</if>
+            <if test="defaultInv != null">defaultInv=#{defaultInv},</if>
 
             thirdSysFk=#{thirdSysFk},
         </trim>