diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java
index 18d4f16..b2e58f7 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java
+++ b/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;
}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java
index 83cb047..eba3ad4 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java
+++ b/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;
}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java
index f684b76..4e9c70e 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java
+++ b/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国家数据库下载出错!");
}
}
}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java
index 6cc154b..b76f842 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java
+++ b/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());
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
index d8dedc1..11b309c 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
+++ b/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}
)
@@ -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}
)
@@ -325,6 +325,7 @@
prefix=#{prefix},
codeFillCheck=#{codeFillCheck},
defaultSubInv=#{defaultSubInv},
+ defaultInv=#{defaultInv},
thirdSysFk=#{thirdSysFk},