问题处理

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

@@ -17,46 +17,51 @@ import java.util.Date;
 @Setter
 public class ProduceOrderSelectDto extends BaseSelectDto {
 
-	/**
+    /**
      * 生产状态 0未开始 1进行中 2已完成
      */
     private String produceStatus;
 
-	/**
-	 * 交期开始时间
-	 */
-	private Date staDeliveryPeriod;
-
-	/**
-	 * 交期结束时间
-	 */
-	private Date endDeliveryPeriod;
-
-	/**
-	 * 排程时间过滤
-	 */
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM")
-	private String beginDate;
-
-	/**
-	 * 归属公司Id
-	 */
-	private Long companyId;
-
-	/**
-	 * 投产时间
-	 */
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-	private Date produceTime;
-
-	/**
-	 * 是否逾期
-	 */
-	private Integer isOverdue;
-
-	/**
-	 * 是否投产
-	 */
-	private Integer isProduce;
+    /**
+     * 交期开始时间
+     */
+    private Date staDeliveryPeriod;
+
+    /**
+     * 交期结束时间
+     */
+    private Date endDeliveryPeriod;
+
+    /**
+     * 排程时间过滤
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM")
+    private String beginDate;
+
+    /**
+     * 归属公司Id
+     */
+    private Long companyId;
+
+    /**
+     * 投产时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date produceTime;
+
+    /**
+     * 是否逾期
+     */
+    private Integer isOverdue;
+
+    /**
+     * 是否投产
+     */
+    private Integer isProduce;
+
+    /**
+     * 订单类型
+     */
+    private Integer contractType;
 
 }

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

@@ -52,4 +52,9 @@ public class ProductionOrderVo extends ProductionOrder {
      */
     private Integer confirmStatus;
 
+    /**
+     * 合同类型
+     */
+    private Integer contractType;
+
 }

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

@@ -146,6 +146,11 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
             wrapper.eq("IF( po.produce_time IS NULL, 0, 1 )", dto.getIsProduce());
         }
 
+        //订单类型检索
+        if (ObjectUtil.isNotEmpty(dto.getContractType())) {
+            wrapper.eq("c.contract_type", dto.getContractType());
+        }
+
         Page<ProductionOrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ProductionOrderVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {

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

@@ -17,7 +17,8 @@
 			   c.prod_remark,
 			   po.finish_time,
 			   (if(IFNULL(po.finish_time, NOW()) > po.delivery_period, 1, 0)) AS isOverdue,
-			   po.confirm_status
+			   po.confirm_status,
+			   c.contract_type
 		from production_order po
 				 LEFT JOIN contract c ON po.contract_id = c.id
 			${ew.customSqlSegment}

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -239,6 +239,8 @@ public class ContractVo extends Contract {
      */
     private String merchUserName;
 
+    private String ofCompanyName;
+
 
 }
 

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -519,6 +519,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             //赋值生产公司
             p.setCompanyName(companyMap.get(p.getCompanyId()));
 
+            //赋值归属公司
+            p.setOfCompanyName(companyMap.get(p.getOfCompanyId()));
+
             //赋值销售部门
             p.setDeptName(companyMap.get(p.getDeptId()));