业务数据流转

src/main/java/com/imcs/admin/business/controller/BusinessController.java

@@ -67,4 +67,10 @@ public class BusinessController {
         businessService.productionPreparationTask(id);
         return Result.success();
     }
+
+    @GetMapping("/processVersion/status/{id}/{parentId}")
+    public Result processVersion(@PathVariable("id") Long id,@PathVariable("parentId") Long parentId){
+        businessService.processVersion(id,parentId);
+        return Result.success();
+    }
 }

src/main/java/com/imcs/admin/business/service/BusinessService.java

@@ -13,4 +13,6 @@ public interface BusinessService {
     void batchSplit(Map<String,Object> map);
 
     void productionPreparationTask(Long id);
+
+    void processVersion(Long id,Long parentId);
 }

src/main/java/com/imcs/admin/business/service/impl/BusinessServiceImpl.java

@@ -68,8 +68,8 @@ public class BusinessServiceImpl implements BusinessService {
             Integer salesAmount = Integer.valueOf(vo.get("salesAmount").toString());
             Long salesOrderId = Long.valueOf(vo.get("salesOrderId").toString());
             Long productId = Long.valueOf(vo.get("productId").toString());
-            String sql="insert into a_production_order (order_code, production_order_code, order_name, product_name, product_code, plan_amount,  status, sales_order_id, product_id,is_issue) values (?,?,?,?,?,?,?,?,?,?)";
-            jdbcService.insert("执行insert",sql,orderCode,generateSerial.generateSerialNumber("aProductionOrder"),orderName,productName,productCode,salesAmount,0,salesOrderId,productId,0);
+            String sql="insert into a_production_order (order_code, production_order_code, order_name, product_name, product_code, plan_amount,  status, sales_order_id, product_id,is_issue,is_plan) values (?,?,?,?,?,?,?,?,?,?,?)";
+            jdbcService.insert("执行insert",sql,orderCode,generateSerial.generateSerialNumber("aProductionOrder"),orderName,productName,productCode,salesAmount,0,salesOrderId,productId,0,0);
         });
         jdbcService.update("update b_sales_order set is_issue = 1 where id = ?",id);
     }
@@ -112,10 +112,10 @@ public class BusinessServiceImpl implements BusinessService {
             if(planAmount == batchAmount || isIssue == 1){
                 continue;
             }
-            String sql="INSERT INTO `imcs_platform`.`a_production_order` (`order_code`, `production_order_code`, `order_name`, `product_name`, `product_code`, `plan_amount`, `old_production_order_id`, `status`, `sales_order_id`, `product_id`, `is_issue`,created_at) " +
-                    "VALUES (?,?,?,?,?,?,?,?,?,?,?,?)";
-            jdbcService.insert("执行insert",sql,orderCode,generateSerial.generateSerialNumber("aProductionOrder"),orderName,productName,productCode,planAmount - batchAmount,id,0,salesOrderId,productId,0,new Date());
-            jdbcService.insert("执行insert",sql,orderCode,generateSerial.generateSerialNumber("aProductionOrder"),orderName,productName,productCode,batchAmount,id,0,salesOrderId,productId,0,new Date());
+            String sql="INSERT INTO `imcs_platform`.`a_production_order` (`order_code`, `production_order_code`, `order_name`, `product_name`, `product_code`, `plan_amount`, `old_production_order_id`, `status`, `sales_order_id`, `product_id`, `is_issue`,created_at,is_plan) " +
+                    "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)";
+            jdbcService.insert("执行insert",sql,orderCode,generateSerial.generateSerialNumber("aProductionOrder"),orderName,productName,productCode,planAmount - batchAmount,id,0,salesOrderId,productId,0,new Date(),0);
+            jdbcService.insert("执行insert",sql,orderCode,generateSerial.generateSerialNumber("aProductionOrder"),orderName,productName,productCode,batchAmount,id,0,salesOrderId,productId,0,new Date(),0);
             jdbcService.update("update a_production_order set status = 1 where id = ?",id);
         }
     }
@@ -124,8 +124,8 @@ public class BusinessServiceImpl implements BusinessService {
     public void productionPreparationTask(Long id) {
         Map<String, Object> one = jdbcService.findOne("select * from a_production_preparation_task where id = ?", id);
         String sql="INSERT INTO `imcs_platform`.`a_production_design_preparation_task` ( `order_code`, `order_name`, `task_code`, `product_name`, `product_code`," +
-                " `amount`,  `status`, `created_at`,  `production_order_code`, `production_order_id`, `task_type`,sales_order_id,production_preparation_task_id) " +
-                "VALUES ( ?, ?, ?, ?, ?,  ?, ?, ?, ?, ?, ?,?,?);";
+                " `amount`,  `status`, `created_at`,  `production_order_code`, `production_order_id`, `task_type`,sales_order_id,production_preparation_task_id,business_type) " +
+                "VALUES ( ?, ?, ?, ?, ?,  ?, ?, ?, ?, ?, ?,?,?,?);";
         String orderCode = one.get("orderCode").toString();
         String orderName = one.get("orderName").toString();
         String productName = one.get("productName").toString();
@@ -135,8 +135,14 @@ public class BusinessServiceImpl implements BusinessService {
         Long productionOrderId = Long.valueOf(one.get("productionOrderId").toString());
         Long salesOrderId = Long.valueOf(one.get("salesOrderId").toString());
         for (int i = 1 ;i <= serialMap.size() ; i++){
-            jdbcService.insert("执行insert",sql,orderCode,orderName,generateSerial.generateSerialNumber(serialMap.get(i)),productName,productCode,amount,0,new Date(),productionOrderCode,productionOrderId,i,salesOrderId,id);
+            jdbcService.insert("执行insert",sql,orderCode,orderName,generateSerial.generateSerialNumber(serialMap.get(i)),productName,productCode,amount,0,new Date(),productionOrderCode,productionOrderId,i,salesOrderId,id,2);
         }
         jdbcService.update("update a_production_preparation_task set status = 1 where id = ?",id);
     }
+
+    @Override
+    public void processVersion(Long id,Long parentId) {
+        jdbcService.update("update a_process_version set status = 1 where id = ?",id);
+        jdbcService.update("update a_process_version set status = 0 where id != ? and parent_id = ?",id,parentId);
+    }
 }