Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_production_api

src/main/java/cn/ezhizao/project/business/controller/BizProductionPlanDetailSubDetailEquipmentUserController.java

@@ -1,6 +1,8 @@
 package cn.ezhizao.project.business.controller;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
@@ -10,6 +12,7 @@ import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -80,16 +83,28 @@ public class BizProductionPlanDetailSubDetailEquipmentUserController extends Bas
     public AjaxResult save(@RequestBody List<BizProductionPlanDetailSubDetailEquipmentUser> bizProductionPlanDetailSubDetailEquipmentUser) throws NoSuchFieldException, IllegalAccessException
     {
         setTenantId(bizProductionPlanDetailSubDetailEquipmentUser);
-        if(bizProductionPlanDetailSubDetailEquipmentUser.size()>0){
-            BizProductionPlanDetailSubDetailEquipmentUser equipmentUser = new BizProductionPlanDetailSubDetailEquipmentUser();
-            equipmentUser.setProductionPlanDetailSubDetailEquipmentId(bizProductionPlanDetailSubDetailEquipmentUser.get(0).getProductionPlanDetailSubDetailEquipmentId());
-            equipmentUser.setEquipmentDetailId(bizProductionPlanDetailSubDetailEquipmentUser.get(0).getEquipmentDetailId());
-            equipmentUser.setEquipmentDetailCode(bizProductionPlanDetailSubDetailEquipmentUser.get(0).getEquipmentDetailCode());
-            List<BizProductionPlanDetailSubDetailEquipmentUser> oldList = bizProductionPlanDetailSubDetailEquipmentUserService.getList(equipmentUser);
-
-            return toAjax(saveOrUpdateBatch(bizProductionPlanDetailSubDetailEquipmentUserService,bizProductionPlanDetailSubDetailEquipmentUser,oldList));
+//        if(bizProductionPlanDetailSubDetailEquipmentUser.size()>0){
+//            BizProductionPlanDetailSubDetailEquipmentUser equipmentUser = new BizProductionPlanDetailSubDetailEquipmentUser();
+//            equipmentUser.setProductionPlanDetailSubDetailEquipmentId(bizProductionPlanDetailSubDetailEquipmentUser.get(0).getProductionPlanDetailSubDetailEquipmentId());
+//            equipmentUser.setEquipmentDetailId(bizProductionPlanDetailSubDetailEquipmentUser.get(0).getEquipmentDetailId());
+//            equipmentUser.setEquipmentDetailCode(bizProductionPlanDetailSubDetailEquipmentUser.get(0).getEquipmentDetailCode());
+//            List<BizProductionPlanDetailSubDetailEquipmentUser> oldList = bizProductionPlanDetailSubDetailEquipmentUserService.getList(equipmentUser);
+//
+//            return toAjax(saveOrUpdateBatch(bizProductionPlanDetailSubDetailEquipmentUserService,bizProductionPlanDetailSubDetailEquipmentUser,oldList));
+//        }
+        List<Long> ids = new ArrayList<>();
+        for (BizProductionPlanDetailSubDetailEquipmentUser item: bizProductionPlanDetailSubDetailEquipmentUser
+             ) {
+            ids.add(item.getProductionPlanDetailSubDetailEquipmentId());
         }
-        return error("未选择操作员");
+        ids = ids.stream().distinct().collect(Collectors.toList());
+        QueryWrapper<BizProductionPlanDetailSubDetailEquipmentUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("production_plan_detail_sub_detail_equipment_id", ids);
+
+        List<BizProductionPlanDetailSubDetailEquipmentUser> oldList = bizProductionPlanDetailSubDetailEquipmentUserService.list(queryWrapper);
+
+
+        return toAjax(saveOrUpdateBatch(bizProductionPlanDetailSubDetailEquipmentUserService,bizProductionPlanDetailSubDetailEquipmentUser,oldList));
     }
 
     /**

src/main/java/cn/ezhizao/project/business/controller/ProductionTaskController.java

@@ -66,8 +66,8 @@ public class ProductionTaskController extends BaseController {
      * @param data 前端传递的数据
      * @return List<BizProcess> 返回数据
      */
-    @PostMapping(value = "/getSubDetailProcessEquipments")
-    public TableDataInfo getSubDetailProcessEquipments(@RequestBody Map<String, Object> data) {
+    @GetMapping(value = "/getSubDetailProcessEquipments")
+    public TableDataInfo getSubDetailProcessEquipments( BizProductionPlanDetailSubDetailEquipment data) {
         // 根据【工序id】，获取工序【biz_process】列表，并分页显示
         startPage();
         List<BizProductionPlanDetailSubDetailEquipment> equipments = productionPlanDetailSubDetailEquipmentService.getList(data);

src/main/java/cn/ezhizao/project/business/domain/BizProductionPlanDetailSubDetailEquipmentUser.java

@@ -26,10 +26,28 @@ public class BizProductionPlanDetailSubDetailEquipmentUser extends BaseEntity
     @ApiModelProperty(value = "${comment}")
     private Long productionPlanDetailSubDetailEquipmentId;
 
+    private Long productionPlanDetailId;
+
+    @Excel(name = "工艺id")
+    @ApiModelProperty(value = "工艺id")
+    private Long technologicalProcessId;
     /** 设备id */
     @ApiModelProperty(value = "${comment}")
     private Long equipmentDetailId;
+    /** 子计划id */
+    @ApiModelProperty(value = "${comment}")
+    private Long productionPlanDetailSubDetailId;
 
+    /**
+     * 产品id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long productId;
+    /**
+     * 工序id
+     */
+    @ApiModelProperty(value = "=seq1(2位)+seq2(1位)+0(第4位用于单批单改)")
+    private Long processId;
     /** 设备编码 */
     @Excel(name = "设备编码")
     @ApiModelProperty(value = "设备编码")

src/main/java/cn/ezhizao/project/business/domain/BizTechnologicalProcessDetail.java

@@ -39,6 +39,17 @@ public class BizTechnologicalProcessDetail extends BaseEntity
     @ApiModelProperty(value = "=seq1(2位)+seq2(1位)+0(第4位用于单批单改)")
     private String processStepNumber;
 
+    /**
+     * 产品id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long productId;
+    /**
+     * 工序id
+     */
+    @ApiModelProperty(value = "=seq1(2位)+seq2(1位)+0(第4位用于单批单改)")
+    private Long processId;
+
     /** 工序编码 */
     @Excel(name = "工序编码")
     @ApiModelProperty(value = "工序编码")