From 6a1fd1ead9573a09f5ed9f2b61adbec74177b1f2 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 28 Jun 2022 15:55:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4=E8=A1=A5=E5=8D=95=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/entity/basic/BussinessTypeEntity.java | 1 + .../sale/admin/res/basic/BussinessTypResponse.java | 1 + .../com/glxp/sale/admin/thread/AsyncDiDlHelper.java | 2 +- .../sale/admin/thread/InvProductsTrService.java | 5 ++--- .../mybatis/mapper/basic/BussinessTypeDao.xml | 13 +++++++------ 5 files changed, 12 insertions(+), 10 deletions(-) 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},