From ad39278bbc0e72830c8b56563732c325d1e8495c Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 26 Jul 2024 17:14:03 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BF=AE=E6=94=B9=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=AE=8C=E6=88=90=E4=B8=94=E6=9C=AA=E5=90=8C=E6=AD=A5?= =?UTF-8?q?ERP=E7=9A=84=E5=8E=9F=E6=9D=90=E6=96=99=E5=85=A5=E5=BA=93List?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hw/mes/domain/MesPurchaseOrder.java | 11 +++++++++++ .../main/resources/mapper/wms/WmsRawInstockMapper.xml | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesPurchaseOrder.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesPurchaseOrder.java index 7900c54..41abe57 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesPurchaseOrder.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesPurchaseOrder.java @@ -134,6 +134,17 @@ public class MesPurchaseOrder extends BaseEntity { /**判断是否需要绑定*/ private String bindFlag; + /**规格参数*/ + private String specificationParameter; + + public String getSpecificationParameter() { + return specificationParameter; + } + + public void setSpecificationParameter(String specificationParameter) { + this.specificationParameter = specificationParameter; + } + public void setPurchaseOrderId(Long purchaseOrderId) { this.purchaseOrderId = purchaseOrderId; diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml index 606b34d..5c35a54 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml @@ -210,11 +210,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join wms_base_warehouse wbw on wbw.warehouse_id = wri.warehouse_id left join mes_base_material_info mbmi on mbmi.material_id = wri.material_id left join mes_base_unit_info mbui on mbui.erp_id = mbmi.material_unit_id - left join (select po_no, material_id, max(specification_parameter) specification_parameter - from mes_purchase_order - group by po_no, material_id) mpo on mpo.po_no = wri.po_no and mpo.material_id = wri.material_id + join (select po_no, material_id, max(specification_parameter) specification_parameter + from mes_purchase_order + group by po_no, material_id) mpo on mpo.po_no = wri.po_no and mpo.material_id = wri.material_id where wri.execute_status = 2 - and wri.erp_status != 1 + and (wri.erp_status != 1 or wri.erp_status is null) and wri.instock_type in (1, 3) and wri.instock_amount > if(wri.erp_amount is null, 0, wri.erp_amount)