diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java index 15bfb926..cfdb4584 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java @@ -90,7 +90,7 @@ public interface WmsProductPutMapper { void updateWmsProductStatus(WmsProductPut wmsProductPut2); - List selectWmsProductPutSAPByIds(String productOrder); + List selectWmsProductPutSAPByIds(@Param("id")String id); // String selectProOrderWorkorder(WmsProductPut wmsProductPut1); 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 7a5568c2..3e3db616 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 @@ -282,7 +282,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPut) { WmsProductPut wmsProductPutSAPById = wmsProductPutMapper.selectWmsProductPutSAPById(wmsProductPut1.getId()); if (wmsProductPutSAPById != null) { - List wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByIds(wmsProductPutSAPById.getProductOrder()); + List wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByIds(wmsProductPutSAPById.getId()); if (wmsProductPut2.size() > 0) { List> mapList = new ArrayList<>(); Map map = new HashMap<>(); 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 2175b032..f670fe46 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 @@ -472,11 +472,11 @@ UPDATE wms_product_put SET status = '1' - WHERE plan_quantity = put_quantity + WHERE AND status != '1' AND id = #{id} - SELECT DISTINCT wms_product_put.id, wms_product_put.work_order, diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml index 38b84164..d7d8cd8e 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml @@ -77,8 +77,10 @@ and po_no = #{poNo} and po_line = #{poLine} and po_type = #{poType} - and material_code = #{materialCode} - and material_desc = #{materialDesc} + and material_code like concat('%', #{materialCode}, + '%') + and material_desc like concat('%', #{materialDesc}, + '%') and unit = #{unit} and buyer_group = #{buyerGroup} and supply_code = #{supplyCode} @@ -123,6 +125,7 @@ and gmt_modified = #{gmtModified} and active_flag = #{activeFlag} + ORDER BY gmt_create DESC