0311

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/controller/BizDayworkAuxiliaryItemController.java

@@ -108,6 +108,12 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
         });
         return getDataTable(list);
     }
+    @PostMapping("/getAuxiliaryDayworkItemByDayworkId")
+    @Log(title = "获取报工明细", businessType = BusinessType.INSERT)
+    public AjaxResult getAuxiliaryDayworkItemByDayworkId(@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
+        List<BizDayworkAuxiliaryItem> list = bizDayworkAuxiliaryItemService.getListByDayworkId(bizDayworkAuxiliaryItem);
+        return success(list);
+    }
 
     @PostMapping("/getInfoById")
     @Log(title = "辅助工序报工列表信息", businessType = BusinessType.SELECT)

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/domain/BizDayworkAuxiliaryItem.java

@@ -7,6 +7,7 @@ import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
 import cn.ezhizao.project.business.process.domain.BizProcess;
 import cn.ezhizao.project.business.product.domain.BizDaywork;
+import cn.ezhizao.project.business.product.domain.BizDayworkItemReject;
 import cn.ezhizao.project.business.product.domain.BizProduct;
 import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -173,4 +174,6 @@ public class BizDayworkAuxiliaryItem extends BaseEntity
 
     @TableField(exist = true)
     private String remark;
+    @TableField(exist = false)
+    private List<BizDayworkItemReject> rejects;
 }

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/mapper/BizDayworkAuxiliaryItemMapper.java

@@ -26,4 +26,6 @@ public interface BizDayworkAuxiliaryItemMapper extends BaseMapper<BizDayworkAuxi
      * @return 删除结果
     */
     public int physicalDelete(BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem);
+
+    List<BizDayworkAuxiliaryItem> getListByDayworkId(BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem);
 }

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/service/IBizDayworkAuxiliaryItemService.java

@@ -27,4 +27,5 @@ public interface IBizDayworkAuxiliaryItemService extends IService<BizDayworkAuxi
      */
     public int physicalDelete(BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem);
 
+    List<BizDayworkAuxiliaryItem> getListByDayworkId(BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem);
 }

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/service/impl/BizDayworkAuxiliaryItemServiceImpl.java

@@ -38,6 +38,13 @@ public class BizDayworkAuxiliaryItemServiceImpl  extends ServiceImpl<BizDayworkA
      * @return 删除结果
      */
     @Override
-    public int physicalDelete(BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem){ return bizDayworkAuxiliaryItemMapper.physicalDelete(bizDayworkAuxiliaryItem); };
+    public int physicalDelete(BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem){ return bizDayworkAuxiliaryItemMapper.physicalDelete(bizDayworkAuxiliaryItem); }
+
+    @Override
+    public List<BizDayworkAuxiliaryItem> getListByDayworkId(BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
+        return bizDayworkAuxiliaryItemMapper.getListByDayworkId(bizDayworkAuxiliaryItem);
+    }
+
+    ;
 
 }

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

@@ -555,9 +555,9 @@ public class BizDayworkController extends BaseController {
                         }
                     } else {
                         for (int i = 0; i < currentDayworkProcessDetails.size(); i++) {
-                            if (currentDayworkProcessDetails.get(i).getProcessId().equals(daywork.getCurrentProcess().getId())
-                                    &&
-                                    (i + 1) < currentDayworkProcessDetails.size()) {
+                            if ((currentDayworkProcessDetails.get(i).getProcessId().equals(daywork.getCurrentProcess().getId())
+                                    && currentDayworkProcessDetails.get(i).getProcessStepNumber().equals(daywork.getCurrentProcess().getProcessStepNumber()))
+                                    &&(i + 1) < currentDayworkProcessDetails.size()) {
                                 // 根据工艺单查询下一道工序
                                 BizTechnologicalProcessDetail tempDetail = currentDayworkProcessDetails.get(i + 1);
                                 BizProcess nextProcess = new BizProcess();
@@ -1027,9 +1027,9 @@ public class BizDayworkController extends BaseController {
                         }
                     } else {
                         for (int i = 0; i < currentDayworkProcessDetails.size(); i++) {
-                            if (currentDayworkProcessDetails.get(i).getProcessId().equals(daywork.getCurrentProcess().getId())
-                                    &&
-                                    (i + 1) < currentDayworkProcessDetails.size()) {
+                            if ((currentDayworkProcessDetails.get(i).getProcessId().equals(daywork.getCurrentProcess().getId())
+                                    && currentDayworkProcessDetails.get(i).getProcessStepNumber().equals(daywork.getCurrentProcess().getProcessStepNumber()))
+                                    &&(i + 1) < currentDayworkProcessDetails.size()) {
                                 // 根据工艺单查询下一道工序
                                 BizTechnologicalProcessDetail tempDetail = currentDayworkProcessDetails.get(i + 1);
                                 BizProcess nextProcess = new BizProcess();
@@ -1525,9 +1525,9 @@ public class BizDayworkController extends BaseController {
                         }
                     } else {
                         for (int i = 0; i < currentDayworkProcessDetails.size(); i++) {
-                            if (currentDayworkProcessDetails.get(i).getProcessId().equals(daywork.getCurrentProcess().getId())
-                                    &&
-                                    (i + 1) < currentDayworkProcessDetails.size()) {
+                            if ((currentDayworkProcessDetails.get(i).getProcessId().equals(daywork.getCurrentProcess().getId())
+                                    && currentDayworkProcessDetails.get(i).getProcessStepNumber().equals(daywork.getCurrentProcess().getProcessStepNumber()))
+                                    &&(i + 1) < currentDayworkProcessDetails.size()) {
                                 // 根据工艺单查询下一道工序
                                 BizTechnologicalProcessDetail tempDetail = currentDayworkProcessDetails.get(i + 1);
                                 BizProcess nextProcess = new BizProcess();
@@ -2039,9 +2039,9 @@ public class BizDayworkController extends BaseController {
                         }
                     } else {
                         for (int i = 0; i < currentDayworkProcessDetails.size(); i++) {
-                            if (currentDayworkProcessDetails.get(i).getProcessId().equals(daywork.getCurrentProcess().getId())
-                                    &&
-                                    (i + 1) < currentDayworkProcessDetails.size()) {
+                            if ((currentDayworkProcessDetails.get(i).getProcessId().equals(daywork.getCurrentProcess().getId())
+                                    && currentDayworkProcessDetails.get(i).getProcessStepNumber().equals(daywork.getCurrentProcess().getProcessStepNumber()))
+                                    &&(i + 1) < currentDayworkProcessDetails.size()) {
                                 // 根据工艺单查询下一道工序
                                 BizTechnologicalProcessDetail tempDetail = currentDayworkProcessDetails.get(i + 1);
                                 BizProcess nextProcess = new BizProcess();

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -387,7 +387,7 @@ public class BizDayworkItemController extends BaseController {
         for (BizDayworkItem item : list) {
             for (int i = 0; i < item.getProcessSequence().size(); i++) {
                 if ((i + 1) < item.getProcessSequence().size()) {
-                    if (item.getProcessId().equals(item.getProcessSequence().get(i).getId())) {
+                    if (item.getProcessId().equals(item.getProcessSequence().get(i).getId()) && item.getProcessStepNumber().equals(item.getProcessSequence().get(i).getProcessStepNumber())) {
 
                         item.setNextProcess(item.getProcessSequence().get(i + 1));
                         //查询出非本工段的第一道序

src/main/resources/mybatis/business/auxiliaryDaywork/BizDayworkAuxiliaryItemMapper.xml

@@ -45,6 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                type="cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail">
         <id column="id" property="id"/>
     </resultMap>
+    <resultMap id="BizAuxiliaryDayworkItemAndRejectList" type="cn.ezhizao.project.business.auxiliaryDaywork.domain.BizDayworkAuxiliaryItem">
+        <id column="id" property="id"/>
+        <collection property="rejects" ofType="cn.ezhizao.project.business.product.domain.BizDayworkItemReject"
+                    column="id" select="getRejectList"/>
+    </resultMap>
     <select id="getCarrier" resultType="java.lang.String">
         select GROUP_CONCAT(code SEPARATOR '、') as carrierName
         from biz_carrier
@@ -174,7 +179,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ) )</if>
         </trim>
     </select>
-
+    <select id="getListByDayworkId" resultMap="BizAuxiliaryDayworkItemAndRejectList">
+        select t1.*,t2.process_alias from biz_daywork_auxiliary_item t1 left join biz_process t2 on t1.process_id = t2.id where
+        t1.daywork_id = #{dayworkId} and t1.deleted = 0 and t2.deleted = 0
+        order by t1.process_step_number,t1.create_time
+    </select>
+    <select id="getRejectList" resultType="cn.ezhizao.project.business.product.domain.BizDayworkItemReject">
+        SELECT
+        t1.reject_num,
+        CASE
+        WHEN t1.type = 0 THEN
+        (SELECT dict_label FROM sys_dict_data WHERE dict_type = 'waste_causes' AND dict_value = t1.reason)
+        WHEN t1.type = 1 THEN
+        t1.reason
+        ELSE
+        t1.reason
+        END AS reason from biz_daywork_item_reject t1 where t1.daywork_auxiliary_item_id = #{id}
+        and t1.deleted = 0 and t1.process_inspection_id = 0
+    </select>
     <delete id="physicalDelete">
         DELETE FROM biz_daywork_auxiliary_item
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">

src/main/resources/mybatis/business/product/BizDayworkItemConsultMapper.xml

@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getListByDayworkItemIds" resultMap="BizDayworkItemConsultResult">
         select t1.*,t2.nick_name as technicianName,t3.result from biz_daywork_item_consult t1 left join sys_user t2 on t1.technician_id = t2.user_id
         left join biz_consult_result t3 on t1.consult_result_id = t3.id
-        where t1.deleted = 0
+        where t1.deleted = 0 and is_process_inspection = 0
         and t2.del_flag = 0 and t1.daywork_item_id in
         <foreach collection="dayworkItemIds" index="index" item="item" separator="," open="(" close=")">
             #{item}

src/main/resources/mybatis/business/product/BizDayworkItemMapper.xml

@@ -316,7 +316,14 @@
                 biz_daywork_carrier where deleted = 0 AND is_changed=0 and carrier_code LIKE CONCAT('%',
                 #{keywords}, '%')) )</if>
         </trim>
-        order by t2.lot_code
+        order by t2.production_plan_detail_id, (
+        SELECT create_time
+        FROM biz_daywork_item t
+        WHERE t.daywork_id = t2.id
+        AND t.deleted = 0
+        ORDER BY t.create_time DESC
+        LIMIT 1
+        ) ASC
     </select>