数据

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

@@ -8,12 +8,14 @@ import com.imcs.admin.common.constants.Constants;
 import com.imcs.admin.common.data.Obj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.Map;
 
 @RestController
+@Transactional(rollbackFor = Exception.class)
 @RequestMapping("/business")
 public class BusinessController {
     @Resource
@@ -34,6 +36,21 @@ public class BusinessController {
         return Result.success();
     }
 
+    /**
+     * 批量  销售订单生成为生产令
+     * @param map
+     * @return
+     */
+
+    @PostMapping("/sales/ids")
+    public Result getRefreshBatch(@RequestBody Map<String,Object> map){
+        String[] ids = map.get("ids").toString().split(",");
+        for (String item:ids){
+            businessService.salesProductionOrder(Long.valueOf(item));
+        }
+        return Result.success();
+    }
+
     /**
      * 生产令拆批
      * @param map
@@ -57,6 +74,23 @@ public class BusinessController {
         return Result.success();
     }
 
+    /**
+     * 批量  生产令下发成为设计分发
+     * @param map
+     * @return
+     */
+
+    @PostMapping("/productionOrder/ids")
+    public Result productionOrderBatch(@RequestBody Map<String,Object> map){
+        String[] ids = map.get("ids").toString().split(",");
+        for (String item:ids){
+            businessService.productionOrder(Long.valueOf(item));
+        }
+        return Result.success();
+    }
+
+
+
     /**
      * 设计分发任务->设计、工艺、材料、采购、NC程序 任务
      * @param id
@@ -68,6 +102,22 @@ public class BusinessController {
         return Result.success();
     }
 
+    /**
+     * 批量  设计分发任务->设计、工艺、材料、采购、NC程序 任务
+     * @param map
+     * @return
+     */
+
+    @PostMapping("/productionPreparationTask/ids")
+    public Result productionPreparationTaskBatch(@RequestBody Map<String,Object> map){
+        String[] ids = map.get("ids").toString().split(",");
+        for (String item:ids){
+            businessService.productionPreparationTask(Long.valueOf(item));
+        }
+        return Result.success();
+    }
+
+
     /**
      * 工艺路径 设置 有效
      * @param id
@@ -91,6 +141,21 @@ public class BusinessController {
         return Result.success();
     }
 
+    /**
+     * 批量  生产排产
+     * @param map
+     * @return
+     */
+
+    @PostMapping("/orderToProcedure/ids")
+    public Result orderToProcedureBatch(@RequestBody Map<String,Object> map){
+        String[] ids = map.get("ids").toString().split(",");
+        for (String item:ids){
+            businessService.orderToProcedure(Long.valueOf(item));
+        }
+        return Result.success();
+    }
+
 
     /**
      * 生产任务 批量审批
@@ -114,6 +179,25 @@ public class BusinessController {
         return Result.success();
     }
 
+    /**
+     * 批量 领料
+     * @param map
+     * @return
+     */
+    @PostMapping("/aProductionWorkOrder/receive/ids")
+    public Result receive(@RequestBody Map<String,Object> map){
+        String[] ids = map.get("ids").toString().split(",");
+        for (String item:ids){
+            try {
+                businessService.receive(Long.valueOf(item));
+            }catch (Exception e){
+
+            }
+
+        }
+        return Result.success();
+    }
+
     /**
      * 报工
      * @param id

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

@@ -60,7 +60,7 @@ public class BusinessServiceImpl implements BusinessService{
     @Override
     public void salesProductionOrder(Long id) {
         StringBuffer str=new StringBuffer("select \n" +
-                "so.order_code, so.order_name,m.product_code,m.product_name,sp.sales_amount,so.id as sales_order_id,sp.product_id  \n" +
+                "so.order_code,so.is_issue, so.order_name,m.product_code,m.product_name,sp.sales_amount,so.id as sales_order_id,sp.product_id  \n" +
                 "from b_Sales_Order so \n" +
                 "left join a_sales_product sp on so.id=sp.parent_id\n" +
                 "left join a_product m on sp.product_id=m.id  where so.id = ?");
@@ -78,6 +78,11 @@ 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());
+            Integer isIssue = Integer.valueOf(vo.get("isIssue").toString());
+            if(isIssue == 1){
+                return;
+            }
+
             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);
         });