机器列表修改

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml

@@ -42,6 +42,10 @@
             <if test="machineUpdateTime != null and machineUpdateTime != ''" >
                 machine_update_time = #{machineUpdateTime}
             </if>
+            <if test="machineProduceId != null and machineProduceId != ''" >
+                machine_produce_id = #{machineProduceId}
+            </if>
+
         </set>
         <where>
             <if test="machineId != null and machineId != ''">

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

@@ -196,14 +196,14 @@ public class MachineController {
             ptsMachineLogs.setLogsErrorType(null);//还原为默认值
         }
         //修改机器信息
-        if(!isAbnormality){
             PtsMachine ptsMachine2 = new PtsMachine();
             ptsMachine2.setMachineId(ptsMachine.getMachineId());
-            ptsMachine2.setMachineProcessState(2);//2表示机器生产过程中出现异常
+            if(!isAbnormality){
+                ptsMachine2.setMachineProcessState(2);//2表示机器生产过程中出现异常
+            }
             ptsMachine2.setMachineUpdateTime(new Date());
             ptsMachine2.setMachineProduceId(produce.getProduceId());
             machineService.updateMachine(ptsMachine2);
-        }
         //截取条形码尾号（4位）
         rj.addResponseKeyValue("barcodeTail",berQrcode.substring(berQrcode.length()-4, berQrcode.length()));
         return rj;

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.ftl

@@ -265,7 +265,7 @@
                                         +'<td class="text-c" width="100"><div id="" onclick="print('+value.machineBarcode+')"><img style="width: 50px;height: 50px;" src="'+value.machineQrcode+'"></td>'
                                         +'<td class="text-c" width="100">'+machineIsPrint+'</td>'
                                         +'<td class="text-c" width="100">'+machineSalesState+'</td>'
-										+'<td class="text-c" width="100">'+machineSalesDate+'</td>'
+
                             			+'<td class="text-c" width="100">'+machineProcessState+'</td>'
                                         +'<td class="text-c" width="100">'+machineProducedTime+'</td>'
                                         +'<td class="text-c" width="50">'+machineHardwareVersion+'</td>'