luobang 1 year ago
parent
commit
7172721816

+ 10 - 2
src/main/java/com/steerinfo/dil/controller/TmstruckSelfMachineController.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.mapper.RulesMapper;
 import com.steerinfo.dil.service.impl.TmstruckSelfMachineService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.DataChange;
@@ -24,6 +25,9 @@ public class TmstruckSelfMachineController extends BaseRESTfulController {
     @Autowired
     TmstruckSelfMachineService tmstruckSelfMachineService;
 
+    @Autowired
+    RulesMapper rulesMapper;
+
     /**
      * 提货单
      * @param orderNumber
@@ -65,11 +69,15 @@ public class TmstruckSelfMachineController extends BaseRESTfulController {
     @PostMapping("/queryNumber")
     public Map<String,Object> queryNumber(@RequestParam String orderNumber){
         Map<String,Object> bigDecimal=new HashMap<>();
+        Integer maxPrintDurationTime = 180000;
+        Integer maxPrintNumber = 5;
         bigDecimal.put("printnumber",0);
         Map<String,Object> bigDecimal1 = tmstruckSelfMachineService.queryNumber(orderNumber);
+        maxPrintDurationTime = rulesMapper.getVersionValue(13) == null ? 180000 : rulesMapper.getVersionValue(13);
+        maxPrintNumber = rulesMapper.getVersionValue(14) == null ? 5 : rulesMapper.getVersionValue(14);
         if(bigDecimal1 == null
-        || (DataChange.dataToBigDecimal(bigDecimal1.get("printnumber")).intValue() > 5)
-        || (bigDecimal1.get("printDate")!=null && new Date().getTime() - ((Date)bigDecimal1.get("printDate")).getTime() < 1000*60*3)) {
+        || (DataChange.dataToBigDecimal(bigDecimal1.get("printnumber")).intValue() > maxPrintNumber)
+        || (bigDecimal1.get("printDate")!=null && new Date().getTime() - ((Date)bigDecimal1.get("printDate")).getTime() < maxPrintDurationTime)) {
             bigDecimal.put("printnumber",1);
         }
         return bigDecimal;

+ 3 - 0
src/main/java/com/steerinfo/dil/mapper/RulesMapper.java

@@ -44,4 +44,7 @@ public interface RulesMapper {
 
     //查询还没有出厂门岗ID的实绩
     Integer getNoGatepostIdResult(BigDecimal orderId);
+
+    Integer getVersionValue(int i);
+
 }

+ 4 - 0
src/main/resources/com/steerinfo/dil/mapper/RulesMapper.xml

@@ -145,4 +145,8 @@
             on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         where OO.ORDER_ID = #{orderId}
     </select>
+    <select id="getVersionValue" resultType="java.lang.Integer" parameterType="java.lang.Integer">
+        SELECT VERSION_VALUE FROM DIL_VERSION
+        WHERE VERSION_ID = #{i}
+    </select>
 </mapper>