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