新增后台抽检后台功能

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/dao/InspectionMapper.java

@@ -0,0 +1,16 @@
+package com.github.zuihou.business.operationManagementCenter.dao;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.github.zuihou.base.mapper.SuperMapper;
+import com.github.zuihou.business.operationManagementCenter.entity.Inspection;
+import com.github.zuihou.database.mybatis.auth.DataScope;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface InspectionMapper extends SuperMapper<Inspection> {
+
+    IPage<Inspection> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<Inspection> queryWrapper, DataScope dataScope);
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/InspectionService.java

@@ -0,0 +1,27 @@
+package com.github.zuihou.business.operationManagementCenter.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.service.SuperService;
+import com.github.zuihou.business.operationManagementCenter.dto.InspectionSaveDTO;
+import com.github.zuihou.business.operationManagementCenter.dto.PlanZoneSaveDTO;
+import com.github.zuihou.business.operationManagementCenter.entity.Inspection;
+import com.github.zuihou.business.operationManagementCenter.entity.Order;
+import com.github.zuihou.business.operationManagementCenter.entity.PlanZone;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+
+/**
+ * <p>
+ * 业务接口
+ * 订单生产单元
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-29
+ */
+public interface InspectionService extends SuperService<Inspection> {
+
+    IPage<Inspection> pageList(IPage page, LbqWrapper<Inspection> wrapper);
+
+
+    Boolean check(InspectionSaveDTO model);
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/InspectionServiceImpl.java

@@ -0,0 +1,26 @@
+package com.github.zuihou.business.operationManagementCenter.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.service.SuperServiceImpl;
+import com.github.zuihou.business.operationManagementCenter.dao.InspectionMapper;
+import com.github.zuihou.business.operationManagementCenter.dto.InspectionSaveDTO;
+import com.github.zuihou.business.operationManagementCenter.entity.Inspection;
+import com.github.zuihou.business.operationManagementCenter.service.InspectionService;
+import com.github.zuihou.database.mybatis.auth.DataScope;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class InspectionServiceImpl extends SuperServiceImpl<InspectionMapper, Inspection> implements InspectionService {
+    @Override
+    public IPage<Inspection> pageList(IPage page, LbqWrapper<Inspection> wrapper) {
+        return baseMapper.pageList(page, wrapper, new DataScope());
+    }
+
+    @Override
+    public Boolean check(InspectionSaveDTO model) {
+        return true;
+    }
+}

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/PlanMapper.xml

@@ -26,8 +26,8 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,update_time,order_product_id,
-        plan_no, order_id, audit_status, remark, create_user, plan_status, update_user, start_time, end_time, scheduling_status, produce_status,partsNo,partsAlias,bomAlias,deliveryTime,pdeliveryTime,
-        unqualifiedBomNum, prority, status,rhythm_type,orderNo,orderStatus,orderName,source,bomDesc,process,planBomNum,zoenDesc,completeNum,org_id
+        plan_no, order_id, audit_status, remark, create_user, plan_status, update_user, start_time, end_time, scheduling_status, produce_status,bomId, partsNo,partsAlias,bomAlias,deliveryTime,pdeliveryTime,produceNum,
+        unqualifiedBomNum, prority, status,rhythm_type,orderNo,orderStatus,orderName,source,bomDesc,process,planBomNum,zoenDesc,completeNum,zoneId, org_id,workpieceIds
     </sql>
 
     <!-- 分页 -->
@@ -35,22 +35,22 @@
         select
         <include refid="Base_Column_List"/>
         from (
-        select a.*,b.order_no as orderNo,b.order_name orderName,b.source,b.order_status as orderStatus,c.bomDesc,c.partsNo,c.partsAlias,c.bomAlias,c.pdeliveryTime,b.delivery_time deliveryTime,c.order_product_id,d.org_id,
-        ifnull(v.completeCount ,0) as completeNum,unqualifiedBomNum,
+        select a.*,b.order_no as orderNo,b.order_name orderName,b.source,b.order_status as orderStatus,c.bomDesc,ifnull(b.produce_num,0) as produceNum, c.bomId, c.partsNo,c.partsAlias,c.bomAlias,c.pdeliveryTime,b.delivery_time deliveryTime,c.order_product_id,d.id as zoneId, d.org_id,
+        ifnull(v.completeCount ,0) as completeNum,unqualifiedBomNum, group_concat(t.id) as workpieceIds,
         CASE WHEN ifnull(w.taskCount,0)=0 then 0 else  round(100 *( wcCount / taskCount),2) end process,ifnull(c.plan_bom_num,0) as planBomNum,d.name as zoenDesc from imcs_p_plan a
         left join (
         select ord.* from imcs_o_order ord
         )b on a.order_id = b.id
         left join (
-        select pp.*,bo.name as bomDesc,bo.parts_no partsNo,bo.parts_alias partsAlias,bo.bom_alias bomAlias,op.delivery_time pdeliveryTime from imcs_p_plan_product pp
+        select pp.*,bo.id as bomId, bo.name as bomDesc,bo.parts_no partsNo,bo.parts_alias partsAlias,bo.bom_alias bomAlias,op.delivery_time pdeliveryTime from imcs_p_plan_product pp
         left join imcs_b_bom bo on pp.bom_id = bo.id
         left join imcs_o_order_product op on pp.order_product_id = op.id
         ) c on a.id= c.plan_id
         left join
-
         imcs_z_zone d on d.id = b.zone_id
         LEFT JOIN ( SELECT t.plan_id, count(1) taskCount,  sum(CASE WHEN t. STATUS = '3' THEN 1 ELSE 0 END) wcCount FROM imcs_t_task t GROUP BY t.plan_id) w ON a.id = w.plan_id
         LEFT JOIN ( SELECT i.plan_id, sum(CASE WHEN i.is_end = '1' THEN 1 ELSE 0 END) completeCount,sum(CASE WHEN i.test_result = '0' THEN 1 ELSE 0 END) unqualifiedBomNum FROM imcs_t_workpiece i GROUP BY i.plan_id ) v ON a.id = v.plan_id
+        LEFT JOIN imcs_t_workpiece t on c.plan_id = t.plan_id
         where 1=1
         <if test="taskBatchNo != null and taskBatchNo != ''">
             and a.id in(select plan_id from imcs_t_task where task_batch_no = #{taskBatchNo})

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/Plan.java

@@ -194,6 +194,10 @@ public class Plan extends Entity<Long> {
     @TableField(exist = false)
     private String orderStatus;
 
+    @ApiModelProperty(value = "产品ID")
+    @TableField(exist = false)
+    private Long bomId;
+
     @ApiModelProperty(value = "产品")
     @TableField(exist = false)
     private String bomDesc;
@@ -202,6 +206,10 @@ public class Plan extends Entity<Long> {
     @TableField(exist = false)
     private Integer planBomNum;
 
+    @ApiModelProperty(value = "产线ID")
+    @TableField(exist = false)
+    private Long zoneId;
+
     @ApiModelProperty(value = "生产单元名称")
     @TableField(exist = false)
     private String zoenDesc;
@@ -235,6 +243,10 @@ public class Plan extends Entity<Long> {
     @TableField(exist = false)
     private String source;
 
+    @ApiModelProperty(value = "生产中数量")
+    @TableField(exist = false)
+    private String produceNum;
+
 
     @ApiModelProperty(value = "交货时间")
     @TableField(exist = false)
@@ -313,6 +325,9 @@ public class Plan extends Entity<Long> {
     @Excel(name = "订单明细ID")
     private Long orderProductId;
 
+    @ApiModelProperty(value = "工件IDs")
+    @TableField(exist = false)
+    private String workpieceIds;
 
     @ApiModelProperty(value = "计划IDs")
     @Length(max = 128, message = "计划IDs不能超过128")