wms部分代码修改

op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java

@@ -154,6 +154,15 @@ public class OdsProcureOutOrder extends BaseEntity {
      */
     @Excel(name = "用户自定义属性2")
     private String userDefined2;
+    private String workorderCode;
+
+    public String getWorkorderCode() {
+        return workorderCode;
+    }
+
+    public void setWorkorderCode(String workorderCode) {
+        this.workorderCode = workorderCode;
+    }
 
     /**
      * 用户自定义属性3

op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java

@@ -82,4 +82,6 @@ public interface OdsProcureOutOrderMapper {
     List<String> selectOdsProcureOutOrderListZUKEN(OdsProcureOutOrder order);
 
     List<String> selectOdsProcureOutOrderListZUKENX(OdsProcureOutOrder order);
+
+    String selectMachineCode(@Param("order")OdsProcureOutOrder odsProcureOutOrder);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java

@@ -284,14 +284,15 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     public OdsProcureOutOrder PurchaseOrderOutboundPda(OdsProcureOutOrder odsProcureOrder) {
         //母单，其中list里面是对应的子单
         OdsProcureOutOrder odsProcureOutOrder = odsProcureOutOrderMapper.selectmesPrepare(odsProcureOrder);
-
+        String  machine=  odsProcureOutOrderMapper.selectMachineCode(odsProcureOutOrder);
         if (odsProcureOutOrder != null) {
             List<OdsProcureOutOrder> orderList = odsProcureOutOrderMapper.selectmesPrepareDetail(odsProcureOutOrder);
+            for (OdsProcureOutOrder order:orderList){
+                order.setProductionLineCode(machine);
+            }
             odsProcureOutOrder.setList(orderList);
         }
-
         return odsProcureOutOrder;
-
     }
 
     @Override

op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml

@@ -39,6 +39,7 @@
         <result property="Active" column="Active"/>
         <result property="enterpriseId" column="Enterprise_Id"/>
         <result property="enterpriseCode" column="Enterprise_Code"/>
+		<result property="workorderCode" column="workorderCode"/>
     </resultMap>
     <sql id="pagination_tail">
 		limit #{page.pageOffset} , #{page.rows}
@@ -263,6 +264,7 @@
 		SELECT
 			prepare_id	id,
 			workorder_name	Produce_Code,
+			workorder_code	workorderCode,
 			product_code	Material_Code,
 			product_name	Material_Desc,
 			unit	Unit,
@@ -396,4 +398,10 @@
 			#{item.userDefined1}
 		</foreach>
 	</select>
+	<select id="selectMachineCode"	resultType="java.lang.String">
+		SELECT
+			machine_code
+		FROM	mes_report_work
+		WHERE	workorder_code=#{order.workorderCode}	AND	end_report='1'
+	</select>
 </mapper>