From 028e2a05839aa5f27c0022bb567e1b96a9606808 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 11 Oct 2024 13:43:21 +0800 Subject: [PATCH] =?UTF-8?q?wms=E5=85=A5=E5=BA=93=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/mapper/OdsProcureOrderMapper.java | 2 ++ .../wms/service/impl/OdsProcureOrderServiceImpl.java | 11 +++++++---- .../resources/mapper/wms/OdsProcureOrderMapper.xml | 8 ++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java index 7f5de53f7..bf39355d6 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java @@ -105,4 +105,6 @@ public interface OdsProcureOrderMapper { void deleteBatchPallet(@Param("list")List dtos0); List getIdCardListByU1(OdsProcureOrder order); + + String selectOdsProcureOrderUserDefined7New(@Param("formattedTEM")String formattedDate); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index 5d3ef2cef..c9a8412cb 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -688,10 +688,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { if (orderList.size() > 0) { continue; } - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd"); Date date = new Date(); String formattedDate = dateFormat.format(date); - order.setUserDefined7(formattedDate+order.getUserDefined3()); + String userDefined7= odsProcureOrderMapper.selectOdsProcureOrderUserDefined7New(formattedDate); + order.setUserDefined7(userDefined7); order.setPlanNumber(new BigDecimal(sapPurchaseOrderQuery1.get("menge"))); order.setUnit(sapPurchaseOrderQuery1.get("meins")); order.setSupplierCode(sapPurchaseOrderQuery1.get("lifnr")); @@ -974,10 +975,12 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { //这个地方判断下是不是采购单已经被插入了，如果是的话，并且是走的送货单的路径，那就把送货单给她附上 continue; } - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd"); Date date = new Date(); String formattedDate = dateFormat.format(date); - order.setUserDefined7(formattedDate+order.getUserDefined3()); + String userDefined7= odsProcureOrderMapper.selectOdsProcureOrderUserDefined7New(formattedDate); + // order.setUserDefined7(formattedDate+order.getUserDefined3()); + order.setUserDefined7(userDefined7); order.setUserDefined11(sapPurchaseOrderQuery1.get("realDate")); order.setPlanNumber(new BigDecimal(sapPurchaseOrderQuery1.get("thisDeliNum"))); order.setUnit(sapPurchaseOrderQuery1.get("unit")); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml index e86c84d39..475b2d5ee 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml @@ -795,5 +795,13 @@ where User_Defined1= #{userDefined1} ORDER BY CAST(card_num AS INT) +