Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -93,6 +93,7 @@ public class MachineController {
             ptsMachine.setMachineNfcId(nfcId);
             ptsMachine.setMachineHardwareVersion("30");
             ptsMachine.setMachineSoftwareVersion("30");
+            ptsMachine.setMachineProduceId(1);
             machineService.addMachine(ptsMachine);
         }
         boolean isAbnormality = true;//状态是否异常
@@ -200,6 +201,7 @@ public class MachineController {
             ptsMachine2.setMachineId(ptsMachine.getMachineId());
             ptsMachine2.setMachineProcessState(2);//2表示机器生产过程中出现异常
             ptsMachine2.setMachineUpdateTime(new Date());
+            ptsMachine2.setMachineProduceId(produce.getProduceId());
             machineService.updateMachine(ptsMachine2);
         }
         //截取条形码尾号（4位）

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

@@ -35,10 +35,10 @@
 				<select class="my-select" name="produceId">
 						<#if (produceList ?size > 0)>
 							<#list produceList as list>
-								<option value ="${list.produceId}">${list.produceName}</option>
+                                <option value ="${list.produceId}">${list.produceName}</option>
 							</#list>
 						<#else >
-							<option value ="">暂无产品，请到生产产品列表添加产品</option>
+                            <option value ="">暂无产品，请到生产产品列表添加产品</option>
 						</#if>
 				</select>
             </div>