修改机器添加

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

@@ -680,9 +680,9 @@ public class AdminMachineController {
     @ResponseBody
     @RequiresPermissions("machine:add:batch")
     @RequestMapping("/add_renovationMachine")
-    public ResponseJson addRenovationMachine(HttpServletRequest request, Integer batchId, Integer number,Integer isRefurbishment,String machineLine,Integer productType) {
+    public ResponseJson addRenovationMachine(HttpServletRequest request, Integer batchId, Integer number,Integer isRefurbishment,String machineLine) {
         ResponseJson rj = new ResponseJson();
-        if (batchId == null || isRefurbishment == null || machineLine == null || productType == null) {
+        if (batchId == null || isRefurbishment == null || machineLine == null ) {
             rj.setReturnCode(500);
             return rj;
         }
@@ -695,7 +695,7 @@ public class AdminMachineController {
         produce = produceService.getProduce(produce);
 
         Integer productId = produce.getProduceId();
-
+        Integer productType = produce.getProduceType();
         Integer bomId = ptsBatch.getBomId();
         PtsBom ptsBom = new PtsBom();
         ptsBom.setBomId(bomId);