生产任务，生产排程 添加订单类型

hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProduceOrderDetailSelectDto.java

@@ -47,4 +47,9 @@ public class ProduceOrderDetailSelectDto extends BaseSelectDto {
      */
     private Integer isOverdue;
 
+    /**
+     * 合同类型
+     */
+    private Integer contractType;
+
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderDetailVo.java

@@ -148,4 +148,9 @@ public class ProductionOrderDetailVo extends ProductionOrderDetail {
      * 业务员名称
      */
     private String saleUserName;
+
+    /**
+     * 合同类型
+     */
+    private Integer contractType;
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderDetailServiceImpl.java

@@ -107,6 +107,11 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
             wrapper.eq("IF(IFNULL(po.finish_time,NOW())>po.delivery_period,1,0)", dto.getIsOverdue());
         }
 
+        //订单类型检索
+        if (ObjectUtil.isNotEmpty(dto.getContractType())) {
+            wrapper.eq("c.contract_type", dto.getContractType());
+        }
+
         Page<ProductionOrderDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ProductionOrderDetailVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {

hx-mes/src/main/resources/mapper/production/ProduceOrderDetailMapper.xml

@@ -26,7 +26,8 @@
 			   pod.remark,
 			   c.prod_tag,
 			   c.prod_remark,
-			   c.create_user                                                  as saleUserId
+			   c.create_user                                                  as saleUserId,
+			   c.contract_type
 		FROM production_order_detail pod
 				 LEFT JOIN production_order po ON pod.produce_order_id = po.id
 				 LEFT JOIN contract c ON pod.contract_id = c.id