From 38b5f3b176f1155c81424ff273bce44cc1c4a00a Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 3 Mar 2025 10:47:39 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=B5=B7=E5=A4=96=E8=BF=87=E8=B4=A6?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/sap/controller/SapController.java | 13 ++++++++++-- .../op/sap/service/impl/SapItemSyncImpl.java | 1 - .../sap/service/impl/SapOrderServiceImpl.java | 20 ++++++++++++++++++- .../sap/service/impl/SapWmsServicelmpl.java | 10 +++++----- .../controller/WmsToWCSmissionController.java | 1 + .../impl/WmsProductPutServiceImpl.java | 1 - 6 files changed, 36 insertions(+), 10 deletions(-) diff --git a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java index f77b74506..4b49a3191 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java @@ -482,11 +482,20 @@ public class SapController extends BaseController { * @return */ @PostMapping("/sapProductOutboundCostCenter") - @Log(title = "成品下线入库", businessType = BusinessType.SAP) + @Log(title = "成本中心出库", businessType = BusinessType.SAP) public R sapProductOutboundCostCenter(@RequestBody(required = false) List> mapList) { return sapWmsService.sapProductOutboundCostCenter(mapList); } - + /** + * ZMES_962_MB1A 有关内部订单的收货 + * @param mapList + * @return + */ + @PostMapping("/sapProductOutboundCostTW") + @Log(title = "有关内部订单的收货", businessType = BusinessType.SAP) + public R sapProductOutboundCostTW(@RequestBody(required = false) List> mapList) { + return sapWmsService.sapProductOutboundCostCenter(mapList); + } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java index ef63ed292..949bb6643 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java @@ -623,7 +623,6 @@ public class SapItemSyncImpl implements SapItemSyncService { System.out.println(L_ITEM); System.out.println(P_LFSNR); for (Map map : mapList) { - L_ITEM.appendRow(); L_ITEM.setValue("EBELN", map.get("EBELN")); L_ITEM.setValue("EBELP", map.get("EBELP")); 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 736ea7ad2..694a65468 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 @@ -27,6 +27,8 @@ import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -496,7 +498,16 @@ public class SapOrderServiceImpl implements SapOrderService { } // 配置传入参数 JCoTable L_ITEM = func.getTableParameterList().getTable("L_ITEM"); + // 获取当前日期 + LocalDate currentDate = LocalDate.now(); // 使用now()方法获取当前日期并保存到currentDate变量中 +// 定义日期格式化器，格式为"yyyyMMdd" + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); // 创建一个日期格式化器，指定格式为“yyyyMMdd” + +// 将当前日期格式化为字符串 + String formattedDate = currentDate.format(formatter); // 将currentDate格式化为字符串，并保存到formattedDate变量中 + + //取当前时间，类型是20250303 for (Map stringObjectMap : mapList) { L_ITEM.appendRow(); L_ITEM.setValue("AUFNR", stringObjectMap.get("AUFNR")); @@ -504,7 +515,14 @@ public class SapOrderServiceImpl implements SapOrderService { L_ITEM.setValue("LGORT", stringObjectMap.get("LGORT")); L_ITEM.setValue("QUANTITY", stringObjectMap.get("QUANTITY")); L_ITEM.setValue("BATCH", stringObjectMap.get("BATCH")); - L_ITEM.setValue("HSDAT", stringObjectMap.get("HSDAT")); + //判断下是否里面有英文字母，如果有的话，就直接取当前时间为入参 + String HSDAT= (String) stringObjectMap.get("HSDAT"); + if (HSDAT != null && HSDAT.matches(".*[a-zA-Z]+.*")){//有英文字母 + L_ITEM.setValue("HSDAT", formattedDate); + }else {//没有英文字母 + L_ITEM.setValue("HSDAT", stringObjectMap.get("HSDAT")); + } + L_ITEM.setValue("ERFME", stringObjectMap.get("ERFME")); if ("1".equals(stringObjectMap.get("STCK_TYPE"))){ L_ITEM.setValue("STCK_TYPE", ""); diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapWmsServicelmpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapWmsServicelmpl.java index 9eee4faca..4a8d9c2ab 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapWmsServicelmpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapWmsServicelmpl.java @@ -188,13 +188,13 @@ public class SapWmsServicelmpl implements SapWmsService { JCoTable L_ITEM = func.getTableParameterList().getTable("L_ITEM"); for (Map stringObjectMap : mapList) { L_ITEM.appendRow(); - L_ITEM.setValue("COSTCENTER", stringObjectMap.get("COSTCENTER")); + L_ITEM.setValue("COSTCENTER", stringObjectMap.get("COSTCENTER"));//成本中心 L_ITEM.setValue("PLANT", stringObjectMap.get("PLANT"));//工厂 L_ITEM.setValue("LGORT", stringObjectMap.get("LGORT"));//库存地点 - L_ITEM.setValue("MATNR", stringObjectMap.get("MATNR"));// - L_ITEM.setValue("QUANTITY", stringObjectMap.get("QUANTITY"));// - L_ITEM.setValue("MEINS", stringObjectMap.get("MEINS"));// - L_ITEM.setValue("BATCH", stringObjectMap.get("BATCH"));// + L_ITEM.setValue("MATNR", stringObjectMap.get("MATNR"));//物料号 + L_ITEM.setValue("QUANTITY", stringObjectMap.get("QUANTITY"));//数量 + L_ITEM.setValue("MEINS", stringObjectMap.get("MEINS"));//条目单位 + L_ITEM.setValue("BATCH", stringObjectMap.get("BATCH"));//批号 L_ITEM.setValue("PROD_DATE", stringObjectMap.get("PROD_DATE"));//生产日期 L_ITEM.setValue("EXPIRYDATE", stringObjectMap.get("EXPIRYDATE"));//货架寿命到期日 } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index 56535d189..8d9725f41 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -934,6 +934,7 @@ public class WmsToWCSmissionController { List result = odsProcureOutOrderService.listOdsProcureOutOrderTS(order); return success(result); } + //特殊出库--确认 @PostMapping("/OdsProcureOutOrderTSCK") public AjaxResult OdsProcureOutOrderTSCK(@RequestBody OdsProcureOutOrder order) { String result = odsProcureOutOrderService.OdsProcureOutOrderTSCK(order); 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 4fe7916da..42c5c6374 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 @@ -522,7 +522,6 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { map.put("BATCH", mesReportWork.getBatchSK()); map.put("STCK_TYPE", selectedType); if (mesReportWork.getBatch().trim().length()==24){ - String HSDAT = InterceptionSJRules(mesReportWork.getBatch()); map.put("HSDAT", HSDAT); }else {