liyg преди 2 години
родител
ревизия
69bc9e5d3a

+ 5 - 1
src/main/java/com/steerinfo/dil/controller/TmstruckSelfMachineController.java

@@ -6,7 +6,9 @@ import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.xml.crypto.Data;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -65,7 +67,9 @@ public class TmstruckSelfMachineController extends BaseRESTfulController {
         Map<String,Object> bigDecimal=new HashMap<>();
         bigDecimal.put("printnumber",0);
         Map<String,Object> bigDecimal1 = tmstruckSelfMachineService.queryNumber(orderNumber);
-        if(bigDecimal1 != null && DataChange.dataToBigDecimal(bigDecimal1.get("printnumber")).intValue() > 5) {
+        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)) {
             bigDecimal.put("printnumber",1);
         }
         return bigDecimal;

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml

@@ -1380,7 +1380,7 @@
         where oom.Material_Id=#{materialid}
         and oo.order_number=#{orderNumber} and oo.order_status=5-->
     <select id="queryNumber1" resultType="java.util.Map">
-        select oo.PRINTNUMBER "printnumber"
+        select oo.PRINTNUMBER "printnumber",oo .PRINTDATE "printDate"
         from OMSTRUCK_ORDER oo
         where oo.ORDER_NUMBER=#{orderNumber} and OO.ORDER_STATUS=5
         FETCH NEXT 1 ROW ONLY