单据类型设置代码提交(同步)

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<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findList(bussinessTypeFilterRequest);
+        return ResultVOUtils.success(bussinessTypeEntities);
+    }
+
 }

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

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

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

@@ -295,12 +295,15 @@ public class BussinessTypeSaveRequest {
 
 
 
-    private boolean checkVailDate;
+    private Integer checkVailDate;
-    private boolean checkExpire;
+    private Integer checkExpire;
-    private boolean checkCertExpire;
+    private Integer checkCertExpire;
     private String preInBackAction;
     private Integer backPreinType;
+    private Integer sortNum;
     private String checkPreInOrders;
 
+    private Boolean advancePreIn;
+
 
 }

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

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

@@ -144,10 +144,12 @@ public class BasicBussinessTypeResponse {
 
     private boolean fillCodeRel;
 
-    private boolean checkVailDate;
+    private Integer checkVailDate;
-    private boolean checkExpire;
+    private Integer checkExpire;
-    private boolean checkCertExpire;
+    private Integer checkCertExpire;
     private String preInBackAction;
     private Integer backPreinType;
     private String checkPreInOrders;
+    private Boolean advancePreIn;
+    private Integer sortNum;
 }

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
+//@Component
-@EnableScheduling
+//@EnableScheduling
 public class AsyncFetchUdiTask implements SchedulingConfigurer {
 
     final Logger logger = LoggerFactory.getLogger(AsyncFetchUdiTask.class);

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
+//@Component
-@EnableScheduling
+//@EnableScheduling
 public class AsyncUdiTask implements SchedulingConfigurer {
 
     final Logger logger = LoggerFactory.getLogger(AsyncUdiTask.class);

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

@@ -53,7 +53,7 @@
                 ]]>
             </if>
         </where>
-        order by bu.updateTime desc
+        order by bu.sortNum
     </select>
 
     <insert id="insertIgnoreBussinessType" parameterType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@@ -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})
     </insert>
 
     <select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@@ -119,7 +119,15 @@
             <if test="busType != null">
                 AND bu.busType = #{busType}
             </if>
-
+            <if test="corpType != null">
+                AND bu.corpType = #{corpType}
+            </if>
+            <if test="sortNum != null">
+                AND bu.sortNum = #{sortNum}
+            </if>
+            <if test="actionType != null">
+                AND bu.actionType = #{actionType}
+            </if>
             <if test="actionList != null and actionList.size() != 0">
                 AND bu.action in
                 <foreach collection="actionList" index="index" item="item" separator="," open="(" close=")">

src/main/resources/schemas/schema_v2.1.sql

@@ -166,6 +166,12 @@ CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_biz', 'updateTime', 'dateti
 CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_label', 'updateTime', 'datetime', 1);
 CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'datetime', 1);
 
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'advancePreIn', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'sortNum', 'int', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'preInBackAction', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'backPreinType', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkPreInOrders', 'varchar(255)', 1);
+
 # CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3);
 # CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1);