From 1e82f37f7f49c98284aa7736e3fe79208bac7f9b Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 21 Apr 2023 20:14:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=8D=95=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/constant/Constant.java | 11 ++++- .../basic/BasicProductSetController.java | 48 +++++++++++++++++++ .../api/dao/basic/BasicBussinessTypeDao.java | 1 - .../req/basic/BussinessTypeSaveRequest.java | 1 - .../res/basic/BasicBussinessTypeResponse.java | 1 - .../impl/BasicBussinessTypeServiceImpl.java | 8 +++- .../mapper/basic/BasicBussinessTypeDao.xml | 10 ++-- 7 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index 38179c86a..9c62c7459 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/src/main/java/com/glxp/api/constant/Constant.java @@ -6,6 +6,8 @@ public class Constant { public static final String INV_PRE_IN_CODE = "1000001";//默认预验收仓库号 public static final String INV_PRE_CODE = "1000002";//默认寄售仓库号 + + public static String MUTI = "MUTI"; public static final String SERIAL_CACHE_PREFIX = "serial_"; @@ -227,13 +229,15 @@ public class Constant { */ public static final String ORDER_STATUS_CHECK_SUCCESS = "checkSuccess"; - public static final String ORDER_STATUS_WAIT_AUDITED = "waitAudited"; - /** * 单据-已审核标识 */ public static final String ORDER_STATUS_AUDITED = "audited"; + /** + * 待审核 + */ + public static final String ORDER_STATUS_WAIT_AUDITED = "waitAudited"; /** * 单据-供应商已审核 @@ -258,14 +262,17 @@ public class Constant { * 发票登记界面： supInvoice * 出入库明细账 norDetail * 寄售出入库明细账 preDetail + * 预验收出入库明细账 preInDetail */ public static final String ORDER_ACTION_NOR_DETAIL = "norDetail"; public static final String ORDER_ACTION_PRE_DETAIL = "preDetail"; + public static final String ORDER_ACTION_PREIN_DETAIL = "preInDetail"; public static final String ORDER_ACTION_SUP_DELIVERY = "supDelivery"; public static final String ORDER_ACTION_SUP_INVOICE = "supInvoice"; public static final String ORDER_ACTION_SUP_DELAUDIT = "supDelAudit"; public static final String ORDER_ACTION_SUP_INOUT = "supInout"; public static final String ORDER_ACTION_SUP_PREIN = "preInOrder"; + } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java new file mode 100644 index 000000000..ca3e9f6cc --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java @@ -0,0 +1,48 @@ +package com.glxp.api.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.entity.basic.BasicProductSetEntity; +import com.glxp.api.req.basic.FilterBasicProductSetrequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.basic.BasicProductSetService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +public class BasicProductSetController { + + @Resource + BasicProductSetService basicProductSetService; + + + @AuthRuleAnnotation("") + @GetMapping("/spms/basicProduct/setup/filter") + public BaseResponse filterSetUps(FilterBasicProductSetrequest filterBasicProductSetrequest) { + List basicProductSetEntities = basicProductSetService.filterSetup(filterBasicProductSetrequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicProductSetEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicProductSetEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/spms/basicProduct/setup/modify") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) + public BaseResponse modifySetup(@RequestBody BasicProductSetEntity basicProductSetEntity) { + basicProductSetService.updateSetup(basicProductSetEntity); + return ResultVOUtils.success("修改成功"); + } + +} diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java index f4512f5da..3aec53d70 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java @@ -17,7 +17,6 @@ public interface BasicBussinessTypeDao extends BaseMapperPlus filterList(FilterBussinessTypeRequest filterBussinessTypeRequest); 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 fa44a124d..4d5f753f6 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java @@ -301,7 +301,6 @@ public class BussinessTypeSaveRequest { private String preInBackAction; private Integer backPreinType; private Integer sortNum; - private String checkPreInOrders; private Boolean advancePreIn; 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 93d2e9199..1e6785904 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -149,7 +149,6 @@ public class BasicBussinessTypeResponse { 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/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index 717fa7ecf..ce7ce6176 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -210,13 +210,17 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl() - .eq("actionType", 1).eq("inStock", true)); + .eq("actionType", 1).eq("inStock", true).eq("enable", true)); break; case Constant.ORDER_ACTION_PRE_DETAIL: bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() .eq("actionType", 3).eq("inStock", true).eq("enable", true)); break; + case Constant.ORDER_ACTION_PREIN_DETAIL: + bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() + .eq("actionType", 2).eq("inStock", true).eq("enable", true)); + break; case Constant.ORDER_ACTION_SUP_DELIVERY: //允许送货单直接入库变更库存,则不判断送货单是否入库 String deliveryInstock = systemParamConfigService.selectValueByParamKey("deliveryInstock"); @@ -248,10 +252,10 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl() .gt("spUse", 0).eq("enable", true)); break; - case Constant.ORDER_ACTION_SUP_PREIN: bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2)); + default: break; } diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 6823e196c..26cb25018 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -12,7 +12,6 @@ AND bu.action like concat('%', #{action}, '%') - AND bu.inStock = #{inStock} @@ -34,6 +33,9 @@ AND bu.secCheckEnable = #{secCheckEnable} + + AND bu.actionType = #{actionType} + AND bu.busType = #{busType} @@ -70,7 +72,8 @@ vailGroupBuy, busType, inStock, actionType, thrCheckEnable, thrCheckWebNew, thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp, thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, - checkExpire, checkCertExpire, preInBackAction, backPreinType, sortNum) + checkExpire, checkCertExpire, preInBackAction, backPreinType, + sortNum) values (#{mainAction}, #{action}, #{name}, #{enable}, #{remark}, #{thirdSysFk}, #{genUnit}, #{innerOrder}, #{secCheckEnable}, #{checkEnable}, #{checkUdims}, #{checkPdaEd}, #{checkPdaUn}, #{checkPc}, #{checkWebNew}, #{checkSp}, #{checkChange}, #{secCheckUdims}, #{secCheckPdaEd}, #{secCheckPdaUn}, @@ -82,7 +85,8 @@ #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}, #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc}, #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}, #{checkVailDate}, - #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType}, #{sortNum}) + #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType}, + #{sortNum})