质量管理

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

@@ -1,9 +1,13 @@
 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.Order;
 import com.github.zuihou.business.operationManagementCenter.entity.OrderProduct;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -22,4 +26,6 @@ public interface OrderProductMapper extends SuperMapper<OrderProduct> {
 
     List<OrderProduct> getList(OrderProduct bean);
 
+    IPage<OrderProduct> pageList(IPage page,  @Param(Constants.WRAPPER) Wrapper<OrderProduct> queryWrapper);
+
 }

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

@@ -1,8 +1,10 @@
 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.entity.Order;
 import com.github.zuihou.business.operationManagementCenter.entity.OrderProduct;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 
 import java.util.List;
 
@@ -19,4 +21,6 @@ public interface OrderProductService extends SuperService<OrderProduct> {
 
     List<OrderProduct> getlist(OrderProduct bean);
 
+    IPage<OrderProduct> pageList(IPage page, LbqWrapper<OrderProduct> wrapper);
+
 }

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

@@ -1,11 +1,13 @@
 package com.github.zuihou.business.operationManagementCenter.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.business.operationManagementCenter.dao.OrderProductMapper;
 import com.github.zuihou.business.operationManagementCenter.entity.Order;
 import com.github.zuihou.business.operationManagementCenter.entity.OrderProduct;
 import com.github.zuihou.business.operationManagementCenter.service.OrderProductService;
 import com.github.zuihou.base.service.SuperServiceImpl;
 
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -29,4 +31,10 @@ public class OrderProductServiceImpl extends SuperServiceImpl<OrderProductMapper
 
         return baseMapper.getList(bean);
     }
+
+
+    @Override
+    public IPage<OrderProduct> pageList(IPage page, LbqWrapper<OrderProduct> wrapper) {
+        return baseMapper.pageList(page, wrapper);
+    }
 }

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

@@ -19,22 +19,30 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,update_time,
-        order_id, bom_id, bom_num, delivery_time, remark, create_user, update_user, prority
+        id,create_time,update_time,name,order_no,unqualifiedCount,addOrderCount,
+        order_id, bom_id, bom_num, delivery_time, remark, create_user, update_user, prority,produceStatus
     </sql>
 
-    <select id="getList" parameterType="com.github.zuihou.business.operationManagementCenter.entity.OrderProduct" resultType="com.github.zuihou.business.operationManagementCenter.entity.OrderProduct">
-        select a.*,b.name,b.no as bomNo,b.specifications as specifications,b.model,b.brand,ifnull(c.planNum,0) as planNum,
-        (ifnull(a.bom_num,0)-ifnull(c.planNum,0)) as stayPlanNum,d.delivery_time as orderDeliveryTime from imcs_o_order_product a
+    <!-- 分页 -->
+    <select id="pageList" parameterType="String" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from (select a.*,b.name,b.no as bomNo,b.specifications as specifications,b.model,b.brand,ifnull(c.planNum,0) as planNum,
+        (ifnull(a.bom_num,0)-ifnull(c.planNum,0)) as stayPlanNum,d.delivery_time as orderDeliveryTime,d.order_no orderNo,unqualifiedCount,addOrderCount,d.produce_status produceStatus
+        from imcs_o_order_product a
         left join imcs_b_bom b on a.bom_id = b.id
         left join (
           select order_product_id,count(1) as planNum from imcs_p_plan_product where 1=1 group by order_product_id
         )c on a.id= c.order_product_id
         left join imcs_o_order d on a.order_id = d.id
+
+        LEFT JOIN
+        (select order_product_id,count(1) unqualifiedCount,count(u.add_order_id)addOrderCount from
+        imcs_t_task_test_unqualified_bom u
+        GROUP BY u.order_product_id
+        )e on a.id = e.order_product_id
         where 1=1
-      <if test="orderId != '' and orderId != null " >
-          and a.order_id = #{orderId}
-      </if>
+        ) s ${ew.customSqlSegment}
     </select>
 
 </mapper>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/OrderProductController.java

@@ -1,17 +1,25 @@
 package com.github.zuihou.business.controller.operationManagementCenter;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.request.PageParams;
+import com.github.zuihou.business.operationManagementCenter.dto.PlanPageDTO;
 import com.github.zuihou.business.operationManagementCenter.entity.Order;
 import com.github.zuihou.business.operationManagementCenter.entity.OrderProduct;
 import com.github.zuihou.business.operationManagementCenter.dto.OrderProductSaveDTO;
 import com.github.zuihou.business.operationManagementCenter.dto.OrderProductUpdateDTO;
 import com.github.zuihou.business.operationManagementCenter.dto.OrderProductPageDTO;
+import com.github.zuihou.business.operationManagementCenter.entity.Plan;
 import com.github.zuihou.business.operationManagementCenter.service.OrderProductService;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import com.github.zuihou.base.controller.SuperController;
 import com.github.zuihou.base.R;
+import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.log.annotation.SysLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,6 +50,28 @@ import org.springframework.web.bind.annotation.RestController;
 @SysLog(enabled = true)
 public class OrderProductController extends SuperController<OrderProductService, Long, OrderProduct, OrderProductPageDTO, OrderProductSaveDTO, OrderProductUpdateDTO> {
 
+    @Override
+    public void query(PageParams<OrderProductPageDTO> params, IPage<OrderProduct> page, Long defSize) {
+        OrderProductPageDTO data = params.getModel();
+        QueryWrap<OrderProduct> wrap = handlerWrapper(null, params);
+        LbqWrapper<OrderProduct> wrapper = wrap.lambda();
+        Plan plan = BeanUtil.toBean(data, Plan.class);
+
+        //生成in的查询格式
+        plan.setOrderProduceStatus(StringUtil.isEmpty(plan.getOrderProduceStatus())?"":StringUtil.changeIdsArrToSubQueryStr(plan.getOrderProduceStatus()));
+        //构建查询参数
+        wrapper.eq(OrderProduct::getDeliveryTime,plan.getAuditStatus())
+                /*.eq(Plan::getSource,plan.getSource())
+                .eq(Plan::getCustId,plan.getCustId())*/
+//                .eq(Plan::getOrderId,plan.getOrderId())
+//                .eq(Plan::getDraftFlag,plan.getDraftFlag())
+                .orderByDesc(OrderProduct::getCreateTime);
+        baseService.pageList(page,wrapper);
+
+    }
+
+
+
     @ApiOperation(value = "查询订单明细", notes = "查询订单明细")
     @PostMapping("/all")
     public R<List<OrderProduct>> list(@ApiParam(name="订单明细对象",value="传入json格式",required = true)

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

@@ -157,6 +157,28 @@ public class OrderProduct extends Entity<Long> {
     @Excel(name = "日生产节拍(日最大生产数）")
     private Integer limitNum;
 
+
+    @ApiModelProperty(value = "生产状态(1-待生产2-生产中3-暂停4-已完成)")
+    @Length(max = 16, message = "生产状态(1-待生产2-生产中3-暂停4-已完成)长度不能超过16")
+    @TableField(exist = false)
+    @Excel(name = "生产状态(1-待生产2-生产中3-暂停4-已完成)")
+    private String produceStatus;
+
+
+    @ApiModelProperty(value = "不合格品数量")
+    @TableField(exist = false)
+    @Excel(name = "不合格品数量")
+    private Integer unqualifiedCount;
+
+
+
+    @ApiModelProperty(value = "补单次")
+    @TableField(exist = false)
+    @Excel(name = "补单次")
+    private Integer addOrderCount;
+
+
+
     @Builder
     public OrderProduct(Long id, LocalDateTime createTime, LocalDateTime updateTime,
                     Long orderId, Long bomId, Integer bomNum, Date deliveryTime, String remark) {