luobang 2 yıl önce
ebeveyn
işleme
86d6d1530f

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.impl.TmstruckSelfMachineService;
 import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -61,9 +62,12 @@ public class TmstruckSelfMachineController extends BaseRESTfulController {
     */
     @PostMapping("/queryNumber")
     public Map<String,Object> queryNumber(@RequestParam String orderNumber){
-        //Map<String,Object> bigDecimal = tmstruckSelfMachineService.queryNumber(orderNumber);
         Map<String,Object> bigDecimal=new HashMap<>();
         bigDecimal.put("printnumber",0);
+        Map<String,Object> bigDecimal1 = tmstruckSelfMachineService.queryNumber(orderNumber);
+        if(DataChange.dataToBigDecimal(bigDecimal1.get("printnumber")).intValue() > 5) {
+            bigDecimal.put("printnumber",1);
+        }
         return bigDecimal;
     }
 
@@ -75,6 +79,7 @@ public class TmstruckSelfMachineController extends BaseRESTfulController {
      */
     @PostMapping("/changeNumber")
     public void changeNumber(@RequestParam String orderNumber){
+
         tmstruckSelfMachineService.changeNumber(orderNumber);
 
     }

+ 1 - 0
src/main/java/com/steerinfo/dil/service/impl/TmstruckSelfMachineService.java

@@ -147,6 +147,7 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
      * @Description:更新打印数量
      */
     public void changeNumber(String orderNumber){
+
         tmstruckLeaveFactoryResultMapper.changeNumber(orderNumber);
     }
 }

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

@@ -1372,7 +1372,7 @@
 
     <update id="changeNumber">
         update OMSTRUCK_ORDER oo
-        set oo.PRINTNUMBER=1,oo.PRINTDATE=sysdate
+        set oo.PRINTNUMBER= nvl(oo.PRINTNUMBER,0) + 1,oo.PRINTDATE=sysdate
         where oo.ORDER_NUMBER=#{orderNumber} and OO.ORDER_STATUS=5
     </update>
 

+ 1 - 1
src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout