单据类型添加序号，注释掉同步任务

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

@@ -447,7 +447,7 @@ public class BasicBussinessTypeController extends BaseController {
     @GetMapping("/udiwms/busType/selectList")
     public BaseResponse selectList() {
 
-        FilterBussinessTypeRequest bussinessTypeFilterRequest=new FilterBussinessTypeRequest();
+        FilterBussinessTypeRequest bussinessTypeFilterRequest = new FilterBussinessTypeRequest();
         bussinessTypeFilterRequest.setAction("2");
         bussinessTypeFilterRequest.setMainAction("WareHouseOut");
         bussinessTypeFilterRequest.setCorpType(2);

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -428,17 +428,17 @@ public class IoCodeTempController extends BaseController {
         //过期提醒：
 //        SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip");
 
-        if (bussinessTypeEntity.isCheckExpire() && !addOrderRequest.isIgnoreExpire()) {
+        if (bussinessTypeEntity.getCheckExpire() != 0 && !addOrderRequest.isIgnoreExpire()) {
             if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
                 String expireDate = "20" + udiEntity.getExpireDate();
                 long expireTime = DateUtil.parseDateExpire(expireDate);
                 if (expireTime - System.currentTimeMillis() < 0) {
-                    return ResultVOUtils.error(504, "当前产品已过期,是否确定继续添加?");
+                    return ResultVOUtils.error(504, "当前产品已过期,无法继续添加?");
                 }
             }
         }
 
-        //失效期提醒
+        //近效期提醒
         SystemParamConfigEntity recentParamConfigEntity = systemParamConfigService.selectByParamKey("recent_date_tip");
         long recent = Long.parseLong(recentParamConfigEntity.getParamValue());
         if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()) {

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

@@ -392,9 +392,9 @@ public class BasicBussinessTypeEntity {
     @TableField(value = "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")
@@ -408,4 +408,6 @@ public class BasicBussinessTypeEntity {
     //    寄售使用禁止无库存出库
     @TableField(value = "advancePreIn")
     private boolean advancePreIn;
+    @TableField(value = "sortNum")
+    private Integer sortNum;
 }

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

@@ -296,10 +296,11 @@ public class BussinessTypeSaveRequest {
 
 
     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

@@ -110,4 +110,7 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
     private String vueType;
 
     private Integer corpType;
+    private Integer sortNum;
+
+
 }

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

@@ -145,10 +145,11 @@ public class BasicBussinessTypeResponse {
     private boolean fillCodeRel;
 
     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/AsyncHeartTask.java

@@ -19,8 +19,8 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 
 
-@Component
+//@Component
-@EnableScheduling
+//@EnableScheduling
 public class AsyncHeartTask implements SchedulingConfigurer {
 
     final Logger logger = LoggerFactory.getLogger(AsyncHeartTask.class);

src/main/java/com/glxp/api/task/AsyncSpsTask.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 AsyncSpsTask implements SchedulingConfigurer {
 
     final Logger logger = LoggerFactory.getLogger(AsyncSpsTask.class);

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>
@@ -53,7 +52,7 @@
                 ]]>
             </if>
         </where>
-        order by bu.updateTime desc
+        order by bu.sortNum desc
     </select>
 
     <insert id="insertIgnoreBussinessType" parameterType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@@ -70,7 +69,8 @@
                                    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,8 @@
                 #{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">
@@ -122,7 +123,9 @@
             <if test="corpType != null">
                 AND bu.corpType = #{corpType}
             </if>
-
+            <if test="sortNum != null">
+                AND bu.sortNum = #{sortNum}
+            </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

@@ -67,6 +67,7 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkCertExpire', 'tinyint', 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('basic_bussiness_type', 'sortNum', 'int', 1);