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 35197087..18e8b736 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 @@ -473,6 +473,7 @@ public class KingdeeErpService { String FTONDCombo = (String) objectParams.get("FTONDCombo");//领料类型(必填项) String F_JSJY_SCDX = objectParams.containsKey("F_JSJY_SCDX") ? (String) objectParams.get("F_JSJY_SCDX") : null; //来源于该物料bom成品(如果是半成品,那还需要找到该半成品的成品) String F_TOND_Base1 = objectParams.containsKey("F_TOND_Base1") ? (String) objectParams.get("F_TOND_Base1") : null; //来源于成品bom所在销售订单的项目号 + String tips = objectParams.containsKey("tips") ? (String) objectParams.get("tips") : null; //明细备注 try { //业务对象标识 String formId = KingdeeConfig.STK_MisDelivery; @@ -510,6 +511,11 @@ public class KingdeeErpService { JSONObject Base1Object = new JSONObject(); Base1Object.put("FNumber", F_TOND_Base1); FEntity.put("F_TOND_Base1", Base1Object); + if (StringUtils.isNotNull(tips)) { + JSONObject tipsObject = new JSONObject(); + tipsObject.put("FNumber", tips); + FEntity.put("FEntryNote", tipsObject); + } ArrayList entityList = new ArrayList<>(); entityList.add(FEntity); 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 f2cf4b5d..740ef0a8 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 @@ -254,6 +254,7 @@ public class WmsErpScheduledTaskServiceImpl implements IWmsErpScheduledTaskServi data.put("FQty", FRealQty); data.put("FPrice", outstockDetail.getPrice()); data.put("FStockId", wmsConfig.getfStockId()); + data.put("tips", outstockDetail.getTips()); if (StringUtils.isNotNull(outstockDetail.getProductId())) { data.put("F_JSJY_SCDX", outstockDetail.getProductId()); } 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 f51b5cdc..44c24505 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 @@ -239,7 +239,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mpo.price, mpo.specification_parameter, mpp.product_id, - mpp.tond_base_id + mpp.tond_base_id, + wrod.tips from wms_raw_outstock_detail wrod left join wms_raw_outstock wro on wrod.raw_outstock_id = wro.raw_outstock_id left join mes_base_material_info mbmi on mbmi.material_id = wro.material_id