From dfe5847d6fc7426c1803491590b303345a14ba3e Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 27 Dec 2024 10:17:36 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E4=B8=8A=E8=BF=94=E5=9B=9E=E7=9A=84=E5=B9=B4?= =?UTF-8?q?=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sap/service/impl/SapOrderServiceImpl.java | 6 ++- .../impl/WmsProductPutServiceImpl.java | 43 +++++++++++++++---- .../mapper/wms/WmsProductPutMapper.xml | 1 + 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index ac48499e..736ea7ad 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java @@ -517,12 +517,16 @@ public class SapOrderServiceImpl implements SapOrderService { String RETCODE = func.getExportParameterList().getString("RETCODE"); String MESSAGE = func.getExportParameterList().getString("L_MSG"); String MATERIALDOCUMENT = func.getExportParameterList().getString("MATERIALDOCUMENT"); + String MATDOCUMENTYEAR = func.getExportParameterList().getString("MATDOCUMENTYEAR"); if ((Constants.FAIL).equals(Integer.parseInt(RETCODE))) { log.error("订单收货结果-----" + MESSAGE); return R.fail(MESSAGE); } else { log.info("订单收货结果-----" + MESSAGE); - return R.ok(MATERIALDOCUMENT, MESSAGE); + Map map = new HashMap(); + map.put("MATERIALDOCUMENT", MATERIALDOCUMENT); + map.put("MATDOCUMENTYEAR", MATDOCUMENTYEAR); + return R.ok(map, MESSAGE); } } catch (Exception e) { 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 44433319..271fb88d 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 @@ -315,8 +315,13 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { WmsProductPut wmsProductPut4 = new WmsProductPut(); wmsProductPut4.setSapMessage(msg); if (code == 200) {//过账成功 - String date = (String) result.getData(); - wmsProductPut4.setSapProof(date); + // String date = (String) result.getData(); + Map map1 = new HashMap(); + map1 = (Map) result.getData(); + String MATERIALDOCUMENT = (String) map1.get("MATERIALDOCUMENT"); + String MATDOCUMENTYEAR = (String) map1.get("MATDOCUMENTYEAR"); + wmsProductPut4.setSapProof(MATERIALDOCUMENT); + wmsProductPut4.setAttr10(MATDOCUMENTYEAR);//年度凭证 wmsProductPut4.setSapStatus("1"); } else { @@ -537,9 +542,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPut2.setId(mesReportWork.getId()); wmsProductPut2.setSapMessage(msg); if (code == 200) { - //过账成功 - String tem = (String) result.getData(); - wmsProductPut2.setSapProof(tem); +// //过账成功 +// String tem = (String) result.getData(); +// wmsProductPut2.setSapProof(tem); + Map map1 = new HashMap(); + map1 = (Map) result.getData(); + String MATERIALDOCUMENT = (String) map1.get("MATERIALDOCUMENT"); + String MATDOCUMENTYEAR = (String) map1.get("MATDOCUMENTYEAR"); + wmsProductPut2.setSapProof(MATERIALDOCUMENT); + wmsProductPut2.setAttr10(MATDOCUMENTYEAR);//年度凭证 wmsProductPut2.setSapStatus("1"); } else { wmsProductPut2.setSapStatus("2"); @@ -579,8 +590,14 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPut2.setId(mesReportWork.getId()); wmsProductPut2.setSapMessage(msg); if (code == 200) {//过账成功 - String tem = (String) result.getData(); - wmsProductPut2.setSapProof(tem); +// String tem = (String) result.getData(); +// wmsProductPut2.setSapProof(tem); + Map map1 = new HashMap(); + map1 = (Map) result.getData(); + String MATERIALDOCUMENT = (String) map1.get("MATERIALDOCUMENT"); + String MATDOCUMENTYEAR = (String) map1.get("MATDOCUMENTYEAR"); + wmsProductPut2.setSapProof(MATERIALDOCUMENT); + wmsProductPut2.setAttr10(MATDOCUMENTYEAR);//年度凭证 wmsProductPut2.setSapStatus("1"); } else { wmsProductPut2.setSapStatus("2"); @@ -1281,8 +1298,16 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { String result="操作成功"; for (WmsProductPut wmsProductPut: wmsProductPutList){ -// WmsProductPut wmsProductPut1= wmsProductPutMapper.selectWmsProductPutByIdANDStatus(wmsProductPut.getId()); -// + WmsProductPut wmsProductPut1= wmsProductPutMapper.selectWmsProductPutByIdANDStatus(wmsProductPut.getId()); +// //LFBJA 参考凭证会计年度 +// //LFBNR 参考凭证的凭证号 +// //LFPOS 参考凭证项目 +// //EBELN 采购凭证号 +// //EBELP 采购凭证的项目编号 +// //MATNR 物料号 +// //QUANTITY 数量 +// //WERKS 工厂 +// //LGORT 库存地点 // //这个地方 // Map paramMap=new HashMap<>(); // List mapList = new ArrayList<>(); 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 4bd33097..155daf2b 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 @@ -379,6 +379,7 @@ set SAP_status = #{wmsProductPut.sapStatus}, SAP_proof = #{wmsProductPut.sapProof}, + attr10 = #{wmsProductPut.attr10}, SAP_message = #{wmsProductPut.sapMessage} where id in