手动模式

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

@@ -26,6 +26,6 @@ public interface OrderProductMapper extends SuperMapper<OrderProduct> {
 
     List<OrderProduct> getList(OrderProduct bean);
 
-    IPage<OrderProduct> pageList(IPage page,  @Param(Constants.WRAPPER) Wrapper<OrderProduct> queryWrapper);
+    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

@@ -21,6 +21,6 @@ public interface OrderProductService extends SuperService<OrderProduct> {
 
     List<OrderProduct> getlist(OrderProduct bean);
 
-    IPage<OrderProduct> pageList(IPage page, LbqWrapper<OrderProduct> wrapper);
+    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

@@ -34,7 +34,7 @@ public class OrderProductServiceImpl extends SuperServiceImpl<OrderProductMapper
 
 
     @Override
-    public IPage<OrderProduct> pageList(IPage page, LbqWrapper<OrderProduct> wrapper) {
-        return baseMapper.pageList(page, wrapper);
+    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/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,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,update_time,name,order_no,unqualifiedCount,addOrderCount,
+        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>
 
@@ -27,7 +27,7 @@
     <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,
+        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
@@ -42,6 +42,15 @@
         GROUP BY u.order_product_id
         )e on a.id = e.order_product_id
         where 1=1
+        <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>
 

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

@@ -1,6 +1,7 @@
 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;
@@ -11,6 +12,8 @@ import com.github.zuihou.business.operationManagementCenter.dto.OrderProductUpda
 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;
@@ -55,18 +58,18 @@ public class OrderProductController extends SuperController<OrderProductService,
         OrderProductPageDTO data = params.getModel();
         QueryWrap<OrderProduct> wrap = handlerWrapper(null, params);
         LbqWrapper<OrderProduct> wrapper = wrap.lambda();
-        Plan plan = BeanUtil.toBean(data, Plan.class);
+        OrderProduct orderProduct = BeanUtil.toBean(data, OrderProduct.class);
 
-        //生成in的查询格式
-        plan.setOrderProduceStatus(StringUtil.isEmpty(plan.getOrderProduceStatus())?"":StringUtil.changeIdsArrToSubQueryStr(plan.getOrderProduceStatus()));
         //构建查询参数
-        wrapper.eq(OrderProduct::getDeliveryTime,plan.getAuditStatus())
+//        eq(OrderProduct::,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);
+//        .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);
 
     }
 

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)
@@ -178,6 +178,12 @@ public class OrderProduct extends Entity<Long> {
     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,