报工打印v.20

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

@@ -650,13 +650,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   mrw.quantity_feedback quantityFeedback,
 			   mrw.unit,
 			   pow.factory_code factoryCode,
-			   equ.workshop_name workshopName
+			   equ.workshop_name workshopName,
+			   pow.attr2 version
 		from mes_report_work mrw
 		left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code
 		left join base_equipment equ on equ.equipment_code = mrw.machine_code
+		left join pro_order po on po.order_code = pow.order_code
 		where mrw.parent_order = '0'
 		  and mrw.workorder_code = #{workorderCode}
-		  and mrw.del_flag = '0'
+		  and mrw.del_flag = '0' and po.del_flag = '0'
 	</select>
 
     <insert id="insertMesReportWork" parameterType="MesReportWork">

op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java

@@ -101,7 +101,7 @@ public class ProOrder extends TreeEntity {
 	/** $column.columnComment */
 	private String atrr1;
 
-	/** $column.columnComment */
+	/** 订单版本*/
 	private String atrr2;
 
 	/** $column.columnComment */

op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java

@@ -120,7 +120,8 @@ public class SapOrderServiceImpl implements SapOrderService {
                 String ERNAM = maraTable.getString("ERNAM");
                 String ERDAT = maraTable.getString("ERDAT");
                 String STTXT = maraTable.getString("STTXT");
-                log.info("订单输出------："+"订单号：" + AUFNR + " - 订单类型：" + AUART + " - 上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX
+                String VERID = maraTable.getString("VERID");
+                log.info("订单输出------："+"订单号：" + AUFNR + " - 订单类型：" + AUART + "-生产版本:"+ VERID +" -上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX
                         + " - 订单的计划工厂：" + PWERK + " - 订单数量总计：" + GAMNG + " - 基本计量单位：" + GMEIN + " - 任务清单组码：" + PLNNR + " - 基本开始日期：" + GSTRP
                         + " - 基本完成日期：" + GLTRP + " - 输入者：" + ERNAM + " - 创建日期：" + ERDAT + " - 系统状态：" + STTXT);
 //                System.out.println("订单号：" + AUFNR + " - 订单类型：" + AUART + " - 上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX
@@ -131,6 +132,7 @@ public class SapOrderServiceImpl implements SapOrderService {
                 proOrder.setPlanFactoryCode(PWERK);
                 proOrder.setOrderCode(AUFNR);
                 proOrder.setOrderType(AUART);
+                proOrder.setAtrr2(VERID);
                 proOrder.setProdCode(PLNBEZ);
                 proOrder.setProdDesc(MAKTX);
                 proOrder.setQuantity(Long.parseLong(GAMNG.substring(0, GAMNG.indexOf("."))));