diff --git a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpService.java b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpService.java index 39635dcc..35197087 100644 --- a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpService.java +++ b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpService.java @@ -504,8 +504,12 @@ public class KingdeeErpService { JSONObject FStockLocIdObject = new JSONObject(); FStockLocIdObject.put("FSTOCKLOCID__FF100002", FNumberObject); FEntity.put("FStockLocId", FStockLocIdObject);//仓位维度 - FEntity.put("F_JSJY_SCDX", F_JSJY_SCDX); - FEntity.put("F_TOND_Base1", F_TOND_Base1); + JSONObject SCDXObject = new JSONObject(); + SCDXObject.put("FNumber", F_JSJY_SCDX); + FEntity.put("F_JSJY_SCDX", SCDXObject); + JSONObject Base1Object = new JSONObject(); + Base1Object.put("FNumber", F_TOND_Base1); + FEntity.put("F_TOND_Base1", Base1Object); ArrayList entityList = new ArrayList<>(); entityList.add(FEntity); diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductOutstock.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductOutstock.java index 3a24456b..1d7ba55a 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductOutstock.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductOutstock.java @@ -176,13 +176,13 @@ public class WmsProductOutstock extends BaseEntity { private List wmsProductOutstockDetailList; /** 成品bom所在销售订单的项目号 */ - private Long tondBaseId; + private String tondBaseId; - public Long getTondBaseId() { + public String getTondBaseId() { return tondBaseId; } - public void setTondBaseId(Long tondBaseId) { + public void setTondBaseId(String tondBaseId) { this.tondBaseId = tondBaseId; } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java index 07cd3b74..9370e464 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java @@ -186,25 +186,25 @@ public class WmsRawOutstockDetail extends BaseEntity { /** 计量单位编号 */ private String unitCode; - /** 物料bom成品Id */ - private Long productId; + /** 物料bom成品Code */ + private String productId; /** 成品bom所在销售订单的项目号 */ - private Long tondBaseId; + private String tondBaseId; - public Long getProductId() { + public String getProductId() { return productId; } - public void setProductId(Long productId) { + public void setProductId(String productId) { this.productId = productId; } - public Long getTondBaseId() { + public String getTondBaseId() { return tondBaseId; } - public void setTondBaseId(Long tondBaseId) { + public void setTondBaseId(String tondBaseId) { this.tondBaseId = tondBaseId; } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsErpScheduledTaskServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsErpScheduledTaskServiceImpl.java index bf2fe8e5..f2cf4b5d 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsErpScheduledTaskServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsErpScheduledTaskServiceImpl.java @@ -516,8 +516,8 @@ public class WmsErpScheduledTaskServiceImpl implements IWmsErpScheduledTaskServi data.put("FPrice", outstock.getPrice()); data.put("FStockId", wmsConfig.getfStockId()); data.put("FTONDCombo", "一般领料"); - if (StringUtils.isNotNull(outstock.getProductId())) { - data.put("F_JSJY_SCDX", outstock.getProductId()); + if (StringUtils.isNotNull(outstock.getMaterialCode())) { + data.put("F_JSJY_SCDX", outstock.getMaterialCode()); } if (StringUtils.isNotNull(outstock.getTondBaseId())) { data.put("F_TOND_Base1", outstock.getTondBaseId()); diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml index ccd7c3e9..5246b45f 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml @@ -329,13 +329,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mbui.unit_code, mso.price, mso.specification_parameter, - mso.tond_base tond_base_id + mpi.project_no tond_base_id from wms_product_outstock wpo left join mes_base_material_info mbmi on mbmi.material_id = wpo.product_id left join mes_base_unit_info mbui on mbui.erp_id = mbmi.material_unit_id - left join mes_sale_order mso on mso.sale_order_id = wpo.sale_order_id - where mso.is_flag = '1' - and wpo.outstock_type = '1' + left join mes_sale_order mso on mso.sale_order_id = wpo.sale_order_id and mso.is_flag = '1' + left join mes_project_info mpi on mpi.erp_id = mso.tond_base + where wpo.outstock_type = '1' and wpo.outstock_qty > 0 and wpo.apply_qty >= wpo.outstock_qty and wpo.outstock_qty > if(wpo.erp_amount is null, 0, wpo.erp_amount) diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml index 96df4ff9..f51b5cdc 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml @@ -246,10 +246,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join mes_base_unit_info mbui on mbui.erp_id = mbmi.material_unit_id left join (select mpp.plan_code, mpp.sale_order_id, - IF(mpp.sale_order_id > 0, mso.material_id, mpp.material_id) product_id, - mso.tond_base tond_base_id + IF(mpp.sale_order_id > 0, mso.material_code, mbmi.material_code) product_id, + mpi.project_no tond_base_id from mes_product_plan mpp - left join mes_sale_order mso on mso.sale_order_id = mpp.sale_order_id) mpp + left join mes_sale_order mso on mso.sale_order_id = mpp.sale_order_id + left join mes_base_material_info mbmi on mbmi.material_id = mpp.material_id + left join mes_project_info mpi on mpi.erp_id = mso.tond_base) mpp on mpp.plan_code = wro.plan_code left join mes_base_barcode_info mbbi on wrod.material_barcode = mbbi.barcode_info left join mes_purchase_order mpo on mpo.purchase_order_id = mbbi.purchase_order_id