From 35704f22219e258006dddd07206bb9c4f5de0a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 19 Apr 2023 15:03:22 +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=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4(=E5=90=8C?= =?UTF-8?q?=E6=AD=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBussinessTypeController.java | 11 +++++++++++ .../controller/inout/IoCodeTempController.java | 4 ++-- .../entity/basic/BasicBussinessTypeEntity.java | 11 ++++++++--- .../api/req/basic/BussinessTypeSaveRequest.java | 9 ++++++--- .../req/basic/FilterBussinessTypeRequest.java | 3 +++ .../res/basic/BasicBussinessTypeResponse.java | 8 +++++--- .../com/glxp/api/task/AsyncFetchUdiTask.java | 6 +++--- .../java/com/glxp/api/task/AsyncUdiTask.java | 6 +++--- .../mapper/basic/BasicBussinessTypeDao.xml | 16 ++++++++++++---- src/main/resources/schemas/schema_v2.1.sql | 6 ++++++ 10 files changed, 59 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index bc7dd1bc8..5c97cc0d9 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -389,4 +389,15 @@ public class BasicBussinessTypeController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + @GetMapping("/udiwms/busType/selectList") + public BaseResponse selectList() { + + FilterBussinessTypeRequest bussinessTypeFilterRequest=new FilterBussinessTypeRequest(); + bussinessTypeFilterRequest.setAction("2"); + bussinessTypeFilterRequest.setMainAction("WareHouseOut"); + bussinessTypeFilterRequest.setCorpType(2); + List bussinessTypeEntities = basicBussinessTypeService.findList(bussinessTypeFilterRequest); + return ResultVOUtils.success(bussinessTypeEntities); + } + } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index c2d8b4e0b..3235f1b2b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -428,7 +428,7 @@ public class IoCodeTempController extends BaseController { //过期提醒： // SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip"); - if (bussinessTypeEntity.isCheckExpire() && !addOrderRequest.isIgnoreExpire()) { + if (bussinessTypeEntity.getCheckVailDate()==1 && !addOrderRequest.isIgnoreExpire()) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); long expireTime = DateUtil.parseDateExpire(expireDate); @@ -441,7 +441,7 @@ public class IoCodeTempController extends BaseController { //失效期提醒 SystemParamConfigEntity recentParamConfigEntity = systemParamConfigService.selectByParamKey("recent_date_tip"); long recent = Long.parseLong(recentParamConfigEntity.getParamValue()); - if (bussinessTypeEntity.isCheckVailDate() && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()) { + if (bussinessTypeEntity.getCheckVailDate()==1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); long expireTime = DateUtil.parseDateExpire(expireDate); diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index c01f60777..24ccac7f7 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -390,11 +390,11 @@ public class BasicBussinessTypeEntity { @TableField(value = "fillCodeRel") private boolean fillCodeRel; @TableField(value = "checkVailDate") - private boolean checkVailDate; + private Integer checkVailDate; @TableField(value = "checkExpire") - private boolean checkExpire; + private Integer checkExpire; @TableField(value = "checkCertExpire") - private boolean checkCertExpire; + private Integer checkCertExpire; // 预验收退库单据类型 @TableField(value = "preInBackAction") @@ -404,4 +404,9 @@ public class BasicBussinessTypeEntity { private Integer backPreinType; @TableField(value = "checkPreInOrders") private String checkPreInOrders; + // 寄售使用禁止无库存出库 + @TableField(value = "advancePreIn") + private boolean advancePreIn; + @TableField(value = "sortNum") + private Integer sortNum; } diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java index b5496efb0..fa44a124d 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java @@ -295,12 +295,15 @@ public class BussinessTypeSaveRequest { - private boolean checkVailDate; - private boolean checkExpire; - private boolean checkCertExpire; + private Integer checkVailDate; + private Integer checkExpire; + private Integer checkCertExpire; private String preInBackAction; private Integer backPreinType; + private Integer sortNum; private String checkPreInOrders; + private Boolean advancePreIn; + } diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java index 2a1669858..59ea48443 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java @@ -108,4 +108,7 @@ public class FilterBussinessTypeRequest extends ListPageRequest { private Boolean fillCodeRel; private String vueType; + private Integer corpType; + private Integer sortNum; + private Integer actionType; } diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index 4387b6c76..93d2e9199 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -144,10 +144,12 @@ public class BasicBussinessTypeResponse { private boolean fillCodeRel; - private boolean checkVailDate; - private boolean checkExpire; - private boolean checkCertExpire; + private Integer checkVailDate; + private Integer checkExpire; + private Integer checkCertExpire; private String preInBackAction; private Integer backPreinType; private String checkPreInOrders; + private Boolean advancePreIn; + private Integer sortNum; } diff --git a/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java b/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java index 3f49738f5..ec0dfd45f 100644 --- a/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java +++ b/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java @@ -15,9 +15,9 @@ import com.glxp.api.entity.system.ScheduledEntity; import com.glxp.api.idc.service.IdcService; import com.glxp.api.req.system.ScheduledRequest; - -@Component -@EnableScheduling +// +//@Component +//@EnableScheduling public class AsyncFetchUdiTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(AsyncFetchUdiTask.class); diff --git a/src/main/java/com/glxp/api/task/AsyncUdiTask.java b/src/main/java/com/glxp/api/task/AsyncUdiTask.java index 001d5a507..c00ae3170 100644 --- a/src/main/java/com/glxp/api/task/AsyncUdiTask.java +++ b/src/main/java/com/glxp/api/task/AsyncUdiTask.java @@ -15,9 +15,9 @@ import com.glxp.api.entity.system.ScheduledEntity; import com.glxp.api.idc.service.IdcService; import com.glxp.api.req.system.ScheduledRequest; - -@Component -@EnableScheduling +// +//@Component +//@EnableScheduling public class AsyncUdiTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(AsyncUdiTask.class); diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 92bb76ee1..d23da2a07 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -53,7 +53,7 @@ ]]> - order by bu.updateTime desc + order by bu.sortNum @@ -70,7 +70,7 @@ vailGroupBuy, busType, inStock, actionType, thrCheckEnable, thrCheckWebNew, thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp, thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, - checkExpire, checkCertExpire, preInBackAction, backPreinType, checkPreInOrders) + checkExpire, checkCertExpire, preInBackAction, backPreinType, checkPreInOrders,sortNum) values (#{mainAction}, #{action}, #{name}, #{enable}, #{remark}, #{thirdSysFk}, #{genUnit}, #{innerOrder}, #{secCheckEnable}, #{checkEnable}, #{checkUdims}, #{checkPdaEd}, #{checkPdaUn}, #{checkPc}, #{checkWebNew}, #{checkSp}, #{checkChange}, #{secCheckUdims}, #{secCheckPdaEd}, #{secCheckPdaUn}, @@ -82,7 +82,7 @@ #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}, #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc}, #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}, #{checkVailDate}, - #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType}, #{checkPreInOrders}) + #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType}, #{checkPreInOrders}, #{sortNum})