From 73e032c91d6884d98bcc0d8b0b9bdc356d2e4013 Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 15 Jul 2025 16:37:30 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=8E=9F=E6=9D=90=E6=96=99?= =?UTF-8?q?=E9=80=80=E5=BA=93=E4=BC=A0ERP=E6=8E=A5=E5=8F=A3=E6=94=B9?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=87=BA=E5=BA=93=E3=80=81=E5=8E=9F=E6=9D=90?= =?UTF-8?q?=E6=96=99=E5=87=BA=E5=BA=93=E4=B8=8D=E5=88=86=E7=BB=84=E4=BC=A0?= =?UTF-8?q?ERP=E3=80=81=E5=85=B6=E4=BB=96=E5=85=A5=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=8A=A0=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/KingdeeErpService.java | 9 +++- .../com/hw/wms/domain/WmsRawReturnDetail.java | 51 +++++++++++++++++++ .../service/IWmsErpScheduledTaskService.java | 6 +-- .../impl/WmsErpScheduledTaskServiceImpl.java | 27 ++++++---- .../mapper/wms/WmsRawReturnDetailMapper.xml | 8 ++- 5 files changed, 85 insertions(+), 16 deletions(-) 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 9b6b439f..f7149320 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 @@ -610,6 +610,7 @@ public class KingdeeErpService { Double FQty = (Double) objectParams.get("FQty");//实发数量 Double FPrice = (Double) objectParams.get("FPrice");//成本价 String FStockId = (String) objectParams.get("FStockId");//仓库 + String tips = objectParams.containsKey("tips") ? (String) objectParams.get("tips") : null; //明细备注 try { //业务对象标识 String formId = KingdeeConfig.STK_MISCELLANEOUS; @@ -636,6 +637,12 @@ public class KingdeeErpService { JSONObject FAuxPropIdObject = new JSONObject(); FAuxPropIdObject.put("FAUXPROPID__FF100001", FAuxPropId); FEntity.put("FAuxPropId", FAuxPropIdObject); //辅助属性 + JSONObject FNumberObject = new JSONObject(); + FNumberObject.put("FNumber", "001"); + JSONObject FStockLocIdObject = new JSONObject(); + FStockLocIdObject.put("FSTOCKLOCID__FF100002", FNumberObject); + FEntity.put("FStockLocId", FStockLocIdObject);//仓位维度 + FEntity.put("FEntryNote", tips);//备注 ArrayList entityList = new ArrayList<>(); entityList.add(FEntity); @@ -649,7 +656,7 @@ public class KingdeeErpService { model.put("FOwnerTypeIdHead", "BD_OwnerOrg"); //货主类型(必填项) model.put("FOwnerIdHead", KingdeeConfig.getFApplicationOrgId()); //货主(必填项) JSONObject FDeptIdObject = new JSONObject(); - FDeptIdObject.put("FNumber", "BM000001"); + FDeptIdObject.put("FNumber", "JY000042"); model.put("FDeptId", FDeptIdObject); //部门 data.put("Model", model); String saveParams = data.toJSONString(); diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawReturnDetail.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawReturnDetail.java index d8e86eb8..53aa0126 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawReturnDetail.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawReturnDetail.java @@ -117,6 +117,57 @@ public class WmsRawReturnDetail extends BaseEntity private String unitCode; + /** + * 源单单据内码(上游单据：单据内码) + */ + private String fsBillId; + + /** + * 源单单据行内码(上游单据：单据行内码) + */ + private String fsId; + + /** + * 收料单据号 + */ + private String billNo; + + /** + * 备注-申请原因 + */ + private String tips; + + public String getTips() { + return tips; + } + + public void setTips(String tips) { + this.tips = tips; + } + + public String getFsBillId() { + return fsBillId; + } + + public void setFsBillId(String fsBillId) { + this.fsBillId = fsBillId; + } + + public String getFsId() { + return fsId; + } + + public void setFsId(String fsId) { + this.fsId = fsId; + } + + public String getBillNo() { + return billNo; + } + + public void setBillNo(String billNo) { + this.billNo = billNo; + } public void setRawReturnDetailId(Long rawReturnDetailId) { diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsErpScheduledTaskService.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsErpScheduledTaskService.java index 489177e1..70f9d521 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsErpScheduledTaskService.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsErpScheduledTaskService.java @@ -27,7 +27,7 @@ public interface IWmsErpScheduledTaskService { * * @return */ - public Map> synchronizeOtherMaterialDeliveryInformationToERP(); + public Map> synchronizeOtherMaterialDeliveryInformationToERP(); /** @@ -35,10 +35,10 @@ public interface IWmsErpScheduledTaskService { * * @return */ - public Map> synchronizeReturnMaterialDeliveryInformationToERP(); + public Map> synchronizeReturnMaterialDeliveryInformationToERP(); - public int syncOutstockInformation(Map> materialIdMap, Long materialId, String taskType); + public int syncOutstockInformation(Map> materialIdMap, String materialId, String taskType); /** 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 740ef0a8..954b3219 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 @@ -174,14 +174,15 @@ public class WmsErpScheduledTaskServiceImpl implements IWmsErpScheduledTaskServi * @return */ @Override - public Map> synchronizeOtherMaterialDeliveryInformationToERP() { + public Map> synchronizeOtherMaterialDeliveryInformationToERP() { int result = 0; //领料 WmsRawOutstockDetail otherRawOutstockDetail = new WmsRawOutstockDetail(); otherRawOutstockDetail.setTaskTypeStr(WmsConstants.WMS_RAW_OUTSTOCK_TASK_TYPE_PRODUCTION_PICKING + "," + WmsConstants.WMS_RAW_OUTSTOCK_TASK_TYPE_PRODUCTION_INSTALL + "," + WmsConstants.WMS_RAW_OUTSTOCK_TASK_TYPE_AUTO_OUTSTOCK + "," + WmsConstants.WMS_RAW_OUTSTOCK_TASK_TYPE_OTHER); List otherRawOutstockDetailList = wmsRawOutstockDetailMapper.selectWmsRawOutstockDetailERPNotSynchronized(otherRawOutstockDetail); - Map> otherMaterialIdMap = otherRawOutstockDetailList.stream().collect(Collectors.groupingBy(WmsRawOutstockDetail::getMaterialId)); + Map> otherMaterialIdMap = + otherRawOutstockDetailList.stream().collect(Collectors.groupingBy( detail -> detail.getRawOutstockDetailId().toString())); return otherMaterialIdMap; } @@ -193,14 +194,14 @@ public class WmsErpScheduledTaskServiceImpl implements IWmsErpScheduledTaskServi * @return */ @Override - public Map> synchronizeReturnMaterialDeliveryInformationToERP() { + public Map> synchronizeReturnMaterialDeliveryInformationToERP() { int result = 0; //退货出库 WmsRawOutstockDetail returnRawOutstockDetail = new WmsRawOutstockDetail(); returnRawOutstockDetail.setTaskType(WmsConstants.WMS_RAW_OUTSTOCK_TASK_TYPE_RETURN_OUTSTOCK); List returnRawOutstockDetailList = wmsRawOutstockDetailMapper.selectWmsRawOutstockDetailERPNotSynchronized(returnRawOutstockDetail); - Map> returnMaterialIdMap = returnRawOutstockDetailList.stream().collect(Collectors.groupingBy(WmsRawOutstockDetail::getMaterialId)); - + Map> returnMaterialIdMap = + returnRawOutstockDetailList.stream().collect(Collectors.groupingBy( detail -> detail.getRawOutstockDetailId().toString())); return returnMaterialIdMap; } @@ -208,7 +209,7 @@ public class WmsErpScheduledTaskServiceImpl implements IWmsErpScheduledTaskServi @Transactional(rollbackFor = Exception.class) @Override - public int syncOutstockInformation(Map> materialIdMap, Long materialId, String taskType) { + public int syncOutstockInformation(Map> materialIdMap, String materialId, String taskType) { int result = 0; List wmsRawOutstockDetailList = materialIdMap.get(materialId); JSONObject data = new JSONObject(); @@ -346,15 +347,19 @@ public class WmsErpScheduledTaskServiceImpl implements IWmsErpScheduledTaskServi data.put("FDate", fdate); data.put("FMaterialId", rawReturnDetail.getMaterialCode()); data.put("FAuxPropId", specificationParameter); - data.put("FSrcBillNo", srcBillNo); data.put("FUnitID", rawReturnDetail.getUnitCode()); - data.put("FRealQty", FRealQty); + data.put("FQty", FRealQty); data.put("FStockId", wmsConfig.getfStockId()); - data.put("FSupplierCode", supplierCode); - data.put("FTondBase", projectNo); + data.put("tips", rawReturnDetail.getTips()); +// data.put("FSrcBillNo", srcBillNo); +// data.put("FRealQty", FRealQty); +// data.put("FSupplierCode", supplierCode); +// data.put("FTondBase", projectNo); +// data.put("FSBillId", rawReturnDetail.getFsBillId()); +// data.put("FSId", rawReturnDetail.getFsId()); String params = data.toJSONString(); try { - R paramsResult = remoteJindieService.savePurchaseStorage(params, SecurityConstants.INNER); + R paramsResult = remoteJindieService.saveOtherInStorage(params, SecurityConstants.INNER); Gson gson = new Gson(); String paramsResulJson = gson.toJson(paramsResult); log.info("+++++++++paramsResult+++++++" + paramsResulJson); diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawReturnDetailMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawReturnDetailMapper.xml index 9efb058b..2accbc11 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawReturnDetailMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawReturnDetailMapper.xml @@ -34,6 +34,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -229,8 +233,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" wrrd.return_amount, wrrd.return_time, if(wrrd.erp_amount is null, 0, wrrd.erp_amount) erp_amount, - wrrd.erp_status + wrrd.erp_status, + wrr.apply_reason tips from wms_raw_return_detail wrrd + left join wms_raw_return wrr on wrr.raw_return_id = wrrd.raw_return_id left join mes_base_material_info mbmi on mbmi.material_id = wrrd.material_id left join mes_base_unit_info mbui on mbui.erp_id = mbmi.material_unit_id left join mes_base_barcode_info mbbi on wrrd.material_barcode = mbbi.barcode_info