数据

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

@@ -15,7 +15,6 @@ import javax.annotation.Resource;
 import java.util.Map;
 
 @RestController
-@Transactional(rollbackFor = Exception.class)
 @RequestMapping("/business")
 public class BusinessController {
     @Resource
@@ -209,6 +208,22 @@ public class BusinessController {
         return Result.success();
     }
 
+    /**
+     * 批量 报工
+     * @param map
+     * @return
+     */
+
+    @PostMapping("/reportAmount/ids")
+    public Result reportAmount(@RequestBody Map<String,Object> map){
+        String[] ids = map.get("ids").toString().split(",");
+        for (String item:ids){
+            businessService.reportAmount(Long.valueOf(item),map);
+        }
+
+        return Result.success();
+    }
+
     /**
      * 出入库任务
      * @param id
@@ -220,6 +235,21 @@ public class BusinessController {
         return Result.success();
     }
 
+
+    @PostMapping("/inOut/ids")
+    public Result inOutBatch(@RequestBody Map<String,Object> map){
+        String[] ids = map.get("ids").toString().split(",");
+        for (String item:ids){
+            try {
+                businessService.inOut(Long.valueOf(item));
+            }catch (Exception e){
+
+            }
+
+        }
+        return Result.success();
+    }
+
     /**
      * 完工入库
      * @param id
@@ -231,6 +261,16 @@ public class BusinessController {
         return Result.success();
     }
 
+    @PostMapping("/productIn/ids")
+    public Result productInBatch(@RequestBody Map<String,Object> map){
+        String[] ids = map.get("ids").toString().split(",");
+        for (String item:ids){
+                businessService.productIn(Long.valueOf(item));
+
+        }
+        return Result.success();
+    }
+
     /**
      * 报废
      * @param map

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

@@ -124,7 +124,7 @@ public class BusinessServiceImpl implements BusinessService{
             if(planAmount < batchAmount){
                 throw new RuntimeException(orderCode+"数量不足以拆批");
             }
-            if(planAmount == batchAmount || isIssue == 1){
+            if(planAmount.equals(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,is_plan) " +
@@ -378,7 +378,7 @@ public class BusinessServiceImpl implements BusinessService{
         Integer reportAmount=Integer.valueOf(one.get("reportAmount").toString());
         String workCode = one.get("workCode").toString();
         //最后一道工序入库
-        if(endId == id){
+        if(id.equals(endId)){
             Map<String, Object> flag = jdbcService.findOne("select * from a_product_store where parent_id = (select product_id from a_production_order where id = ?)", productionOrderId);
             Map<String, Object> productIdMap = jdbcService.findOne("select product_id from a_production_order where id = ?", productionOrderId);
             Integer productId1 = Integer.valueOf(productIdMap.get("productId").toString());