From db682bb340fd249e2a8c8db10e3ed4a96fcfa0ca Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Sun, 12 Jun 2022 20:41:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E7=BD=91=E9=A1=B5=E8=81=94=E9=80=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/ConnectTestController.java | 2 +- .../controller/inout/OrderController.java | 3 ++- .../entity/basic/BussinessTypeEntity.java | 4 +++ .../admin/res/basic/BussinessTypResponse.java | 4 +++ .../glxp/api/admin/thread/DlBasicService.java | 9 ++++++- .../mybatis/mapper/basic/BussinessTypeDao.xml | 27 +++++++++++++++---- 6 files changed, 41 insertions(+), 8 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/ConnectTestController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/ConnectTestController.java index a4ea57f9..9b1c54e1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/ConnectTestController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/ConnectTestController.java @@ -27,7 +27,7 @@ public class ConnectTestController { AuthConnectEntity authConnectEntity = new AuthConnectEntity(); authConnectEntity.setCompanyName(companyEntity.getName()); authConnectEntity.setSysName("UDI管理系统"); - return ResultVOUtils.success(companyEntity.getName()); + return ResultVOUtils.success(authConnectEntity); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index d21cad16..de111f57 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -251,7 +251,8 @@ public class OrderController { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("sps_sync_review_order"); - if (systemParamConfigEntity.getParamValue().equals("1")) { +// if (systemParamConfigEntity.getParamValue().equals("1")) { + if (bussinessTypeEntity.isEntrutSpms()) { BaseResponse baseResponse = spsDirectClient.downloadOrder(orderFilterRequest.getOrderId(), userId + "", orderFilterRequest.getAction()); return baseResponse; } else diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java index 54738afa..5c141f86 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java @@ -57,5 +57,9 @@ public class BussinessTypeEntity { private String localPrefix; private boolean preIn; private boolean outTospms; + private boolean ullageFill; + private boolean scanPreIn; + private boolean vailInv; + private boolean entrutSpms; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java index 04a5f5fe..afff65ca 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java @@ -60,5 +60,9 @@ public class BussinessTypResponse { private String localPrefix; private boolean preIn; private boolean outTospms; + private boolean ullageFill; + private boolean scanPreIn; + private boolean vailInv; + private boolean entrutSpms; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java index 23973702..b4077d5f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java @@ -32,6 +32,7 @@ import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; import com.glxp.api.admin.service.basic.BasicDownloadService; import com.glxp.api.admin.service.basic.BussinessChangeTypeService; import com.glxp.api.admin.service.basic.EntrustReceService; +import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inventory.InvWarehouseService; import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService; @@ -80,6 +81,8 @@ public class DlBasicService { BussinessChangeTypeService bussinessChangeTypeService; @Resource private BasicDownloadService basicDownloadService; + @Resource + private SystemParamConfigService systemParamConfigService; private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class); //------------------------------------------------------------ @@ -436,7 +439,11 @@ public class DlBasicService { orderEntity.setFromType(ConstantStatus.FROM_UDISP); orderEntity.setReceiveStatus(0); orderEntity.setErpFk(null); -// orderEntity.setOutChangeEnable(false); + String value = systemParamConfigService.selectValueByParamKey("syns_out_change"); + if (value.equals("1")) { + orderEntity.setOutChangeEnable(true); + } else + orderEntity.setOutChangeEnable(false); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); OrderEntity temp = orderService.findById(orderEntity.getId()); if (temp == null) { 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 2b8ed6bb..0bd16659 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -13,6 +13,8 @@ basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange, basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn, basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange, + basic_bussiness_type.entrutSpms, + basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType, basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,basic_bussiness_type.outTospms, basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne, @@ -127,7 +129,8 @@ basic_bussiness_type.enable,basic_bussiness_type.remark,basic_bussiness_type.mainAction, basic_bussiness_type.thirdSysFk,basic_bussiness_type.localAction,basic_bussiness_type.secCheckEnable, basic_bussiness_type.checkUdims,basic_bussiness_type.checkPdaEd,basic_bussiness_type.checkPdaUn,basic_bussiness_type.checkPc, - basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange, + basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange,basic_bussiness_type.entrutSpms, + basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn, basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange,basic_bussiness_type.outTospms, basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType, @@ -181,7 +184,8 @@ checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew, secCheckChange,corpType,basic_bussiness_type.storageCode,checkBalacne, - secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix,outTospms) + secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix,outTospms +,ullageFill,scanPreIn,vailInv,entrutSpms) values ( #{action}, @@ -217,7 +221,10 @@ #{expireTip}, #{updateTime}, #{prefix}, - #{outTospms} + #{outTospms} , + #{ullageFill}, + #{scanPreIn}, + #{vailInv},#{entrutSpms} ) @@ -230,7 +237,9 @@ checkEnable,genUnit,innerOrder,secCheckEnable, checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew, - secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix,outTospms) + secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType, +defaultUnit,useDyCount,expireTip,updateTime,prefix,outTospms +,ullageFill,scanPreIn,vailInv,entrutSpms) values ( #{index}, @@ -267,7 +276,10 @@ #{expireTip}, #{updateTime}, #{prefix}, - #{outTospms} + #{outTospms}, + #{ullageFill}, + #{scanPreIn}, + #{vailInv},#{entrutSpms} ) @@ -309,6 +321,11 @@ updateTime=#{updateTime}, prefix=#{prefix}, outTospms=#{outTospms}, + ullageFill=#{ullageFill}, + scanPreIn=#{scanPreIn}, + vailInv=#{vailInv}, + entrutSpms=#{entrutSpms}, + thirdSysFk=#{thirdSysFk}, WHERE id = #{id}