物资字典参数设置，单据类型修改

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";
 
+
 }

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<BasicProductSetEntity> basicProductSetEntities = basicProductSetService.filterSetup(filterBasicProductSetrequest);
+        PageInfo<BasicProductSetEntity> pageInfo;
+        pageInfo = new PageInfo<>(basicProductSetEntities);
+        PageSimpleResponse<BasicProductSetEntity> 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("修改成功");
+    }
+
+}

src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java

@@ -17,7 +17,6 @@ public interface BasicBussinessTypeDao extends BaseMapperPlus<BasicBussinessType
     /**
      * 查询单据类型列表
      *
-     * @param filterBussinessTypeRequest
      * @return
      */
     List<BasicBussinessTypeResponse> filterList(FilterBussinessTypeRequest filterBussinessTypeRequest);

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;
 

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;
 }

src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java

@@ -210,13 +210,17 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
         switch (vueType) {
             case Constant.ORDER_ACTION_NOR_DETAIL:
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
-                        .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<BasicBussinessTypeEntity>()
                         .eq("actionType", 3).eq("inStock", true).eq("enable", true));
                 break;
+            case Constant.ORDER_ACTION_PREIN_DETAIL:
+                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                        .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<BasicBussinessTyp
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                         .gt("spUse", 0).eq("enable", true));
                 break;
-
             case Constant.ORDER_ACTION_SUP_PREIN:
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                         .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2));
+
             default:
                 break;
         }

src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml

@@ -12,7 +12,6 @@
             <if test="action != null and action != ''">
                 AND bu.action like concat('%', #{action}, '%')
             </if>
-
             <if test="inStock != null">
                 AND bu.inStock = #{inStock}
             </if>
@@ -34,6 +33,9 @@
             <if test="secCheckEnable != null">
                 AND bu.secCheckEnable = #{secCheckEnable}
             </if>
+            <if test="actionType != null">
+                AND bu.actionType = #{actionType}
+            </if>
             <if test="busType != null">
                 AND bu.busType = #{busType}
             </if>
@@ -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})
     </insert>
 
     <select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">