diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java index 95396223c..921c8ee15 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java @@ -51,7 +51,7 @@ public class wmsReportWork extends BaseEntity { private String SAPstatus; private String SAPmessage; /** 生产工单编码 */ - + //已经过账的值 private String SAPquantity; public String getSAPquantity() { diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index d6c81823f..165685f14 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -323,12 +323,6 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @DS("#header.poolName") public List getReportList(wmsReportWork mesReportWork) { List rlist = wmsProductPutMapper.getReportList(mesReportWork); -// //加上已经过账的数量reportCode work_order batch_number batch -// for (wmsReportWork wmsReportWork: -// rlist) { -// String SAPquantity= wmsProductPutMapper.selectWmsProductPutNum(wmsReportWork); -// wmsReportWork.setSAPquantity(SAPquantity); -// } return rlist; } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml index 80963fd33..c1c0bbb7c 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml @@ -310,7 +310,8 @@ mes_report_work.product_name productName, CONVERT(date, GETDATE()) AS productDate, wms_product_put.SAP_status SAPstatus, - wms_product_put.SAP_message SAPmessage + wms_product_put.SAP_message SAPmessage, + CASE WHEN wms_product_put.SAP_status = 1 THEN wms_product_put.put_quantity ELSE 0 END AS SAPquantity FROM mes_report_work LEFT JOIN pro_order_workorder ON mes_report_work.workorder_code= pro_order_workorder.workorder_code @@ -326,10 +327,7 @@ mes_report_work.end_report - - -