计划bug修改-- 计划的选择方式修改v2.0

op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportProduction.java

@@ -43,6 +43,8 @@ public class MesReportProduction extends BaseEntity {
 	private String productSpc;
 	@Excel(name = "工厂编码")
 	private String unit;
+	private String productDateStart;
+	private String productDateEnd;
 
 	public String getFactoryCode() {
 		return factoryCode;
@@ -147,4 +149,20 @@ public class MesReportProduction extends BaseEntity {
 	public void setUnit(String unit) {
 		this.unit = unit;
 	}
+
+	public String getProductDateStart() {
+		return productDateStart;
+	}
+
+	public void setProductDateStart(String productDateStart) {
+		this.productDateStart = productDateStart;
+	}
+
+	public String getProductDateEnd() {
+		return productDateEnd;
+	}
+
+	public void setProductDateEnd(String productDateEnd) {
+		this.productDateEnd = productDateEnd;
+	}
 }

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -133,26 +133,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   sf1.factory_name carName,
 			   sf.factory_code machineCode,
 			   sf.factory_name machineName,
-			   pow.order_code orderCode,
+				mrw.product_code productCode,
-			   pow.product_code productCode,
+				mrw.product_name productName,
-			   pow.product_name productName,
 		       mrw.quantity,
 			   mrw.quantity_feedback quantityFeedback,
 			   mrw.spec productSpc,
 			   mrw.unit
 		from mes_report_work mrw
-		 left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code
+		 left join sys_factory sf on sf.factory_code = mrw.machine_code <!--线体-->
-		 left join sys_factory sf on sf.factory_code = pow.prod_line_code <!--线体-->
 		 left join sys_factory sf1 on sf.parent_id = sf1.factory_id       <!--车间-->
 		 left join sys_factory sf2 on sf1.parent_id = sf2.factory_id      <!--工厂-->
-		where 1=1
+		where
+        1=1
 		<if test="machineName != null  and machineName != ''">and sf.factory_name like concat('%', #{machineName}, '%')</if>
 		<if test="carName != null  and carName != ''">and sf1.factory_name like concat('%', #{carName}, '%')</if>
 		<if test="factoryName != null  and factoryName != ''">and sf2.factory_name like concat('%', #{factoryName}, '%')</if>
 
 		<if test="productCode != null  and productCode != ''">and pow.product_code like concat('%', #{productCode}, '%')</if>
 		<if test="productName != null  and productName != ''">and pow.product_name like concat('%', #{productName}, '%')</if>
-		<if test="orderCode != null  and orderCode != ''">and pow.order_code like concat('%', #{orderCode}, '%')</if>
+
+
 		<if test="productDateStart != null "> and CONVERT(varchar(10),mrw.feedback_time, 120) >= #{productDateStart}</if>
 		<if test="productDateEnd != null "> and #{productDateEnd} >= CONVERT(varchar(10),mrw.feedback_time, 120)</if>
 	</select>

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -91,8 +91,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                 prodLineName += equipMap.get(key).getLabel()+",";
             }
             workorder.setProdLineName(prodLineName);
-            // 通过设备code查询出机型名称
+//            // 通过设备code查询出机型名称
-            workorder.setProdLineCode(proOrderMapper.selectProdLineName(workorder.getProdLineCode()));
+//            workorder.setProdLineCode(proOrderMapper.selectProdLineName(workorder.getProdLineCode()));
             // 通过工艺编码code查询出机型名称
             workorder.setRouteName(proOrderWorkorderMapper.selectRouteNameByRouteCode(workorder.getRouteCode()));
         }
@@ -646,7 +646,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         // 通过班次id查询班次名称
         String shiftDesc = proOrderMapper.selectShiftNameById(proOrderWorkorder.getShiftId());
 
-        JSONArray codeArray = JSONArray.parseArray(proOrderWorkorder.getProdLineName());
+        JSONArray codeArray = JSONArray.parseArray(proOrderWorkorder.getProdLineCode());
         String[][] array = new String[codeArray.size()][2];
         for(int c1=0;c1<codeArray.size();c1++){
             for(int c2=0;c2<2;c2++){