单据类型相关修改

src/main/java/com/glxp/api/constant/Constant.java

@@ -220,6 +220,8 @@ public class Constant {
 
     /**
      * 送货管理界面：     supDelivery
+     * 审核送货单        supDelAudit
+     * 查询出入库单       supInout
      * 到货单管理界面：    supArrival
      * 退货单管理界面：    supReturned
      * 采购入库单界面：    supPurchase
@@ -232,5 +234,7 @@ public class Constant {
     public static final String ORDER_ACTION_PRE_DETAIL = "preDetail";
     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";
 
 }

src/main/java/com/glxp/api/constant/ConstantStatus.java

@@ -86,6 +86,11 @@ public class ConstantStatus {
     public static final Integer ACTION_TYPE_ADVANCE = 3;        //寄售
 
 
+    public static final int ORDER_SPUSE_NO = 0;         //不允许供应商使用
+    public static final int ORDER_SPUSE_LOOK = 1;       //允许供应商查看
+    public static final int ORDER_SPUSE_EDIT = 2;       //允许供应商编辑
+
+
     public static final Integer ORDER_STATUS_ADDITIONAL = 5;    //补录单据
 //    public static final Integer ORDER_STATUS_RECEIVEED = 7;
 

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -196,7 +196,7 @@ public class BasicBussinessTypeController extends BaseController {
                 bussinessTypeFilterRequest.setUserId(getUserId());
             } else {
                 //当前用户为供应商，查询单据类型添加允许供应商使用参数
-                bussinessTypeFilterRequest.setSpUse(true);
+                bussinessTypeFilterRequest.setSpUse(3);
             }
             List<BasicBussinessTypeResponse> bussinessTypeEntities;
             bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -307,7 +307,7 @@ public class BasicBussinessTypeEntity {
      * 是否供应商使用
      */
     @TableField(value = "spUse")
-    private boolean spUse;
+    private int spUse;
 
     /**
      * 是否预验收单据类型

src/main/java/com/glxp/api/req/auth/BussinessTypeFilterRequest.java

@@ -19,7 +19,7 @@ public class BussinessTypeFilterRequest extends ListPageRequest {
     private String type;
     private Integer index;
 
-    private Boolean spUse;
+    private Integer spUse;
     private String localAction;
     private Boolean secCheckEnable;
 

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -260,7 +260,7 @@ public class BussinessTypeSaveRequest {
     /**
      * 是否供应商使用
      */
-    private Boolean spUse;
+    private Integer spUse;
 
     /**
      * 是否预验收单据类型

src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java

@@ -51,7 +51,7 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
     /**
      * 是否供应商使用
      */
-    private Boolean spUse;
+    private Integer spUse;
 
     /**
      * 是否二次验收

src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

@@ -46,7 +46,7 @@ public class BasicBussinessTypeResponse {
     private Boolean changeEnable;
     private Boolean genUnit;
     private String defaultUnit;
-    private Boolean spUse;
+    private int spUse;
     private Boolean secCheckEnable;
     private boolean checkUdims;
     private boolean checkPdaEd;

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

@@ -217,18 +217,30 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
                 if (StrUtil.isNotEmpty(deliveryInstock) && deliveryInstock.equals("1")) {
                     bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                             .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
-                            .eq("spUse", true).eq("enable", true));
+                            .eq("spUse", ConstantStatus.ORDER_SPUSE_EDIT).eq("enable", true));
                 } else {
                     bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                             .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
-                            .eq("spUse", true).eq("inStock", false).eq("enable", true));
+                            .eq("spUse", ConstantStatus.ORDER_SPUSE_EDIT).eq("inStock", false).eq("enable", true));
                 }
 
                 break;
             case Constant.ORDER_ACTION_SUP_INVOICE:
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                         .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
-                        .eq("spUse", true).eq("actionType", 1).eq("enable", true));
+                        .gt("spUse", 0).eq("actionType", 1).eq("enable", true));
+                break;
+
+
+            case Constant.ORDER_ACTION_SUP_DELAUDIT:        //供应商审核送货单
+                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                        .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
+                        .gt("spUse", 0).eq("enable", true));
+                break;
+
+            case Constant.ORDER_ACTION_SUP_INOUT:        //供应商查询出入库单
+                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                        .gt("spUse", 0).eq("enable", true));
                 break;
             default:
                 break;

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: pro
+    active: dev
   jmx:
     enabled: false
 

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

@@ -71,7 +71,7 @@
                                    spUse, preIn, supplementAll, createUser, createTime, preInBack, vailDispatch,
                                    vailGroupBuy, busType, inStock, actionType
                 , thrCheckEnable, thrCheckWebNew, thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp
-                , thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel,checkVailDate,checkCertExpire)
+                , thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, checkCertExpire)
         values (#{mainAction},
                 #{action},
                 #{name},
@@ -126,8 +126,7 @@
                        , #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims},
                 #{thrCheckPc}
                        , #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}
-        , #{checkVailDate}, #{checkExpire}, #{checkCertExpire}
-        )
+                       , #{checkVailDate}, #{checkExpire}, #{checkCertExpire})
     </insert>
 
     <select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@@ -246,7 +245,10 @@
             <if test="enable != null">
                 AND basic_bussiness_type.enable = #{enable}
             </if>
-            <if test="spUse != null">
+            <if test="spUse != null and spUse == '3'.toString()">
+                AND basic_bussiness_type.spUse > 0
+            </if>
+            <if test="spUse != null and spUse != '3'.toString()">
                 AND basic_bussiness_type.spUse = #{spUse}
             </if>
             <if test="code != ''and code != null">