diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java index 4376441c..8649e854 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java +++ b/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 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java index c0270701..435e794c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java @@ -82,4 +82,6 @@ public interface OdsProcureOutOrderMapper { List selectOdsProcureOutOrderListZUKEN(OdsProcureOutOrder order); List selectOdsProcureOutOrderListZUKENX(OdsProcureOutOrder order); + + String selectMachineCode(@Param("order")OdsProcureOutOrder odsProcureOutOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index c90523f9..a51a541c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/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 orderList = odsProcureOutOrderMapper.selectmesPrepareDetail(odsProcureOutOrder); + for (OdsProcureOutOrder order:orderList){ + order.setProductionLineCode(machine); + } odsProcureOutOrder.setList(orderList); } - return odsProcureOutOrder; - } @Override diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index 7a85958b..f87df429 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -39,6 +39,7 @@ + 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} +