查询

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

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -42,6 +43,9 @@ public class BizDayworkController extends BaseController {
     @Resource
     private IBizDayworkCarrierService bizDayworkCarrierService;
 
+    @Resource
+    private IBizLotTechnologicalProcessDetailService bizLotTechnologicalProcessDetailService;
+
     @Resource
     private IBizLotService bizLotService;
 
@@ -65,8 +69,6 @@ public class BizDayworkController extends BaseController {
     @PreAuthorize("@ss.hasPermi('business:daywork:list')")
     @GetMapping("/list")
     public TableDataInfo list(BizDaywork bizDaywork) {
-//        String tenantId = request.getHeader("tenantId");
-//        bizDaywork.setTenantId(Long.valueOf(tenantId));
         startPage();
         //查询当前生产子计划的批次报工列表
         List<BizDaywork> dayworkList = bizDayworkService.getList(bizDaywork);
@@ -87,15 +89,40 @@ public class BizDayworkController extends BaseController {
      */
     @GetMapping("/listItem")
     public TableDataInfo listItem(BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
-//        String tenantId = request.getHeader("tenantId");
-//        bizDayworkItem.setTenantId(Long.valueOf(tenantId));
         startPage();
         //查询批次报工信息列表
         List<BizDayworkItem> itemList = bizDayworkService.getItemList(bizDayworkItem);
+
+        List<BizLotTechnologicalProcessDetail> lotProcessList = new ArrayList<>();//新工序列表
+        List<BizTechnologicalProcessDetail> processList = new ArrayList<>();//标准工序列表
+
+        //是否废回用或单批但改
+        if(bizDayworkItem.getIsAmend() == 1 || bizDayworkItem.getIsWasteRecycling() == 1){
+            //查询新工序列表
+            lotProcessList=bizLotTechnologicalProcessDetailService.query().eq("lot_id",itemList.get(0).getLotId()).list();
+        }else {
+            //查询标准工列表
+            processList=bizTechnologicalProcessDetailService.query().eq("technological_process_id",itemList.get(0).getTechnologicalProcessId()).list();
+        }
         for (BizDayworkItem item : itemList) {
             if (item.getRejectNum() == null) {
                 item.setRejectNum(0);
             }
+            //是单批单改或废品回用
+            //根据当前工序id设置当前工序
+            if(bizDayworkItem.getIsAmend() == 1 || bizDayworkItem.getIsWasteRecycling() == 1){
+                lotProcessList.forEach(lotProcess -> {
+                    if(item.getTechnologicalProcessDetailId().equals(lotProcess.getId())){
+                        item.setProcessAlias(lotProcess.getProcessAlias());
+                    }
+                });
+            }else{
+                processList.forEach(process -> {
+                    if(item.getTechnologicalProcessDetailId().equals(process.getId())){
+                        item.setProcessAlias(process.getProcessAlias());
+                    }
+                });
+            }
         }
         return getDataTable(itemList);
     }

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

@@ -72,9 +72,6 @@ public class BizLotTechnologicalProcessController extends BaseController {
     @Resource
     private IBizLotWasteService bizLotWasteService;
 
-    @Resource
-    private IBizProductionPlanDetailSubDetailService bizProductionPlanDetailSubDetailService;
-
     @Resource
     private IBizDayworkItemService bizDayworkItemService;
 
@@ -279,7 +276,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
                             if (d.getRejectNum() != null) {
                                 t.setAbandonNum(t.getAbandonNum() == null ? d.getRejectNum() : t.getAbandonNum() + d.getRejectNum());
                             } else {
-                                t.setAbandonNum(0);
+                                t.setAbandonNum(t.getAbandonNum()!=0?t.getAbandonNum():0);
                             }
                             t.setQualifiedNum(t.getQualifiedNum() == null ? d.getQualifiedNum() : t.getQualifiedNum() + d.getQualifiedNum());
                             t.setInvestNum(d.getProdNum());

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

@@ -124,6 +124,9 @@ public class BizDaywork extends BaseEntity {
     @TableField(exist = false)
     private List<BizProcess> processSequence;
 
+    /** 是否是修改 */
+    private Integer isAmend;
+
     @TableField(exist = false)
     private BizProcess currentProcess;
 
@@ -179,7 +182,6 @@ public class BizDaywork extends BaseEntity {
     /**
      * 是否废品回收
      */
-    @TableField(exist = false)
     private Long isWasteRecycling;
     /**
      * 母批号
@@ -198,8 +200,8 @@ public class BizDaywork extends BaseEntity {
     @TableField(exist = false)
     private BizProduct product;
 
-    @TableField(exist = false)
-    private Integer isAmend;
+
+
 
     @TableField(exist = false)
     private String productShaftCategoryName;

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

@@ -154,6 +154,7 @@ public class BizDayworkItem extends BaseEntity {
     @TableField(exist = false)
     private List<BizProcess> processSequence;
 
+
     /** 来源Id */
     @ApiModelProperty(value = "来源Id")
     private Long formDayworkItemId;
@@ -218,6 +219,14 @@ public class BizDayworkItem extends BaseEntity {
     @TableField(exist = false)
     private String processStepNumber;
 
+    /** 是否是修改 */
+    @TableField(exist = false)
+    private Integer isAmend;
+    /**
+     * 是否废品回收
+     */
+    @TableField(exist = false)
+    private Long isWasteRecycling;
     public BizDayworkItem() {}
 
     public BizDayworkItem(BizDayworkItem copy) {

src/main/resources/mybatis/business/BizDayworkMapper.xml

@@ -118,7 +118,6 @@
         t4.production_plan_no as productionPlanNo,
         t4.company_alias as companyAlias,
         t2.description,
-        t3.lot_code ,
         t4.furnace_number,
         t3.production_quantity,
         t4.technology_version as technologyVersion,
@@ -145,46 +144,58 @@
         </trim>
         ORDER BY t1.create_time DESC
     </select>
+<!--    之前遗留暂时注释-->
+<!--    <select id="getItemList" parameterType="BizDayworkItem" resultMap="BizDayworkItemResult">-->
+<!--        SELECT-->
+<!--        DISTINCT-->
+<!--        t1.id,-->
+<!--        t1.start_time,-->
+<!--        t1.end_time,-->
+<!--        t1.daywork_id,-->
+<!--        t1.working_hours,-->
+<!--        t1.status,-->
+<!--        t1.prod_num,-->
+<!--        t1.qualified_num,-->
+<!--        t2.nick_name,-->
+<!--        t1.process_id,-->
+<!--        t2.user_name,-->
+<!--        t4.process_alias ,-->
+<!--        t4.process_code,-->
+<!--        t1.equipment_detail_id,-->
+<!--        t1.equipment_detail_code,-->
+<!--        t4.technological_process_id-->
+<!--        FROM biz_daywork_item t1-->
+<!--        LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id-->
+<!--        LEFT JOIN biz_technological_process_detail t4 ON t1.technological_process_id = t4.technological_process_id and-->
+<!--        t1.process_id = t4.process_id-->
 
+<!--        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">-->
+<!--            t1.deleted = 0 and t1.status &lt; 4-->
+<!--            <if test="dayworkId != null and dayworkId != 0">AND t1.daywork_id = #{dayworkId}</if>-->
+<!--            <if test="tenantId != null  and tenantId != 0">AND t1.tenant_id = #{tenantId}</if>-->
+<!--            <if test="processId != null  and processId != 0">AND t1.process_id = #{processId}</if>-->
+<!--            # and t4.process_id = t1.process_id-->
+<!--        </trim>-->
+<!--        ORDER BY t4.process_step_number ASC ,t1.start_time DESC-->
+<!--    </select>-->
     <select id="getItemList" parameterType="BizDayworkItem" resultMap="BizDayworkItemResult">
-        SELECT
-        DISTINCT
-        t1.id,
-        t1.start_time,
-        t1.end_time,
-        t1.daywork_id,
-        t1.working_hours,
-        t1.status,
-        t1.prod_num,
-        t1.qualified_num,
-        t2.nick_name,
-        t1.process_id,
-        t2.user_name,
-        t4.process_alias ,
-        t4.process_code,
-        t1.equipment_detail_id,
-        t1.equipment_detail_code,
-        t4.technological_process_id
-        FROM biz_daywork_item t1
+        SELECT t1.*,t2.user_name FROM biz_daywork_item t1
         LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id
-        LEFT JOIN biz_technological_process_detail t4 ON t1.technological_process_id = t4.technological_process_id and
-        t1.process_id = t4.process_id
-
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            t1.deleted = 0 and t1.status &lt; 4
-            <if test="dayworkId != null and dayworkId != 0">AND t1.daywork_id = #{dayworkId}</if>
-            <if test="tenantId != null  and tenantId != 0">AND t1.tenant_id = #{tenantId}</if>
-            <if test="processId != null  and processId != 0">AND t1.process_id = #{processId}</if>
-            # and t4.process_id = t1.process_id
+        t1.deleted = 0 and t1.status &lt; 4
+        <if test="dayworkId != null and dayworkId != 0">AND t1.daywork_id = #{dayworkId}</if>
+        <if test="isAmend != null and isAmend != 0">AND t1.form_daywork_item_id !=0 </if>
+        ORDER BY t1.process_step_number ASC ,t1.start_time DESC
         </trim>
-        ORDER BY t4.process_step_number ASC ,t1.start_time DESC
     </select>
+
     <select id="getDeptList" resultType="cn.ezhizao.project.system.domain.SysDept">
         select distinct t3.dept_id as Value,t3.dept_name as Label from biz_daywork t1 left join
         biz_production_plan_detail t2 on t2.id = t1.production_plan_detail_id
         left join sys_dept t3 on t1.dept_id = t3.dept_id
         where t2.production_plan_no = #{productionPlanNo} and t2.line_number = #{lineNumber}
     </select>
+
     <select id="getDayworkProcessList" resultType="cn.ezhizao.project.business.domain.BizProcess">
         select distinct t3.id as Value,t3.process_alias as Label from biz_daywork t1 left join biz_daywork_item t2 on
         t1.id = t2.daywork_id left join biz_process t3 on t2.process_id =