Merge remote-tracking branch 'origin/master' into master

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("orderNo")String orderNo,@Param("bomName")String bomName,@Param("produceStatus")String produceStatus, @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,String orderNo,String bomName,String produceStatus, 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,String orderNo,String bomName,String produceStatus, LbqWrapper<OrderProduct> wrapper) {
+        return baseMapper.pageList(page, orderNo, bomName, produceStatus, wrapper);
+    }
 }

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

@@ -292,6 +292,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
                     TaskNode taskNode = new TaskNode();
 //                    taskNode.setAutoNode(autoNode).setAutoNodeCode(autoNode.getCode()).setCompleteBatchNo(t.getCompleteBatchNo())
 //                            .setNodeNo(autoNode.getNodeNo()).setExeStatus("1").setPrority(autoCode.getWeight());
+                    taskNode.setNodeNo(autoCode.getNo());
                     taskNode.setCompleteBatchNo(t.getCompleteBatchNo())
                             .setExeStatus("1").setPrority(autoCode.getWeight());
 //                    if (autoNode.getInterfaceType() != null) {

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

@@ -314,7 +314,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
                     totalOpNum ++;
                 }
                 part.setId(workpiece.getCompleteBatchNo());
-                part.setName(orderProduct.getName());
+                part.setName(orderProduct.getBomName());
                 part.setOperationNum(bomProcedureList.size());
                 part.setOpList(opList);
                 // 根据最终版本调整交互日期及优先级

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

@@ -19,22 +19,39 @@
 
     <!-- 通用查询结果列 -->
     <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,bomName,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 bomName,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>
+        <if test="orderNo != null and orderNo != ''">
+            and d.order_no like concat('%', #{orderNo}, '%')
+        </if>
+        <if test="produceStatus != null and produceStatus != ''">
+            and d.produce_Status = #{produceStatus}
+        </if>
+        <if test="bomName != null and bomName != ''">
+            and b.name like concat('%', #{bomName}, '%')
+        </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,28 @@
 package com.github.zuihou.business.controller.operationManagementCenter;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+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.time.LocalDateTime;
 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 +53,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();
+        OrderProduct orderProduct = BeanUtil.toBean(data, OrderProduct.class);
+
+        //构建查询参数
+//        eq(OrderProduct::,plan.getAuditStatus())
+                /*.eq(Plan::getSource,plan.getSource())
+                .eq(Plan::getCustId,plan.getCustId())*/
+//                .eq(Plan::getOrderId,plan.getOrderId())
+//                .eq(Plan::getDraftFlag,plan.getDraftFlag())
+//        .geHeader(Order::getDeliveryTime, StrUtil.isEmpty(order.getDeliveryTime_st())?null: LocalDateTime.parse(order.getDeliveryTime_st()))
+//                .leFooter(Order::getDeliveryTime, StrUtil.isEmpty(order.getDeliveryTime_ed())?null:LocalDateTime.parse(order.getDeliveryTime_ed()))
+        wrapper.  orderByDesc(OrderProduct::getCreateTime);
+        baseService.pageList(page,orderProduct.getOrderNo(),orderProduct.getBomName(),orderProduct.getProduceStatus(),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/dto/OrderProductPageDTO.java

@@ -1,6 +1,8 @@
 package com.github.zuihou.business.operationManagementCenter.dto;
 
 import java.time.LocalDateTime;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
@@ -23,6 +25,8 @@ import lombok.experimental.Accessors;
 import com.github.zuihou.common.constant.DictionaryType;
 import java.io.Serializable;
 
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
 /**
  * <p>
  * 实体类
@@ -57,6 +61,18 @@ public class OrderProductPageDTO implements Serializable {
     @NotEmpty(message = "bom_id不能为空")
     @Length(max = 32, message = "bom_id长度不能超过32")
     private String bomId;
+
+
+    @ApiModelProperty(value = "订单编号")
+    @NotEmpty(message = "订单编号不能为空")
+    @Length(max = 128, message = "订单编号长度不能超过128")
+    @Excel(name = "订单编号")
+    private String orderNo;
+
+
+    @ApiModelProperty(value = "产品名")
+    @TableField(exist = false)
+    private String bomName;
     /**
      * 数量
      */
@@ -74,4 +90,14 @@ public class OrderProductPageDTO implements Serializable {
     @Length(max = 256, message = "备注长度不能超过256")
     private String remark;
 
+    @ApiModelProperty(value = "生产状态(1-待生产2-生产中3-暂停4-已完成)")
+    @Length(max = 16, message = "生产状态(1-待生产2-生产中3-暂停4-已完成)长度不能超过16")
+    @Excel(name = "生产状态(1-待生产2-生产中3-暂停4-已完成)")
+    private String produceStatus;
+
+    @TableField(exist = false)
+    private String deliveryTime_st;
+    @TableField(exist = false)
+    private String deliveryTime_ed;
+
 }

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

@@ -114,7 +114,7 @@ public class OrderProduct extends Entity<Long> {
 
     @ApiModelProperty(value = "产品名")
     @TableField(exist = false)
-    private String name;
+    private String bomName;
 
     @ApiModelProperty(value = "产品编号")
     @TableField(exist = false)
@@ -157,6 +157,34 @@ 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;
+
+
+    @TableField(exist = false)
+    private String deliveryTime_st;
+    @TableField(exist = false)
+    private String deliveryTime_ed;
+
+
+
     @Builder
     public OrderProduct(Long id, LocalDateTime createTime, LocalDateTime updateTime,
                     Long orderId, Long bomId, Integer bomNum, Date deliveryTime, String remark) {

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/entity/ResourceAutoCode.java

@@ -29,6 +29,15 @@ public class ResourceAutoCode extends Entity<Long> {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 设备业务名
+     */
+    @ApiModelProperty(value = "节点编码")
+    @Length(max = 256, message = "节点编码长度不能超过256")
+    @TableField(value = "no", condition = LIKE)
+    @Excel(name = "编码")
+    private String no;
+
     /**
      * 设备业务名
      */