From 19a968333c363f2de6a4d99c9c0d3d9616a372cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Thu, 8 May 2025 16:12:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9C=89=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=85=A5=E5=BA=93=E5=92=8C=E9=A2=86=E6=96=99=E4=B8=8B?= =?UTF-8?q?=E5=8F=91mes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cim/idm/service/impl/MESServiceImpl.java | 4 ++-- .../com/cim/idm/controller/InvoiceController.java | 4 ++-- .../idm/controller/PurchaseReturnController.java | 2 +- .../com/cim/idm/controller/SaleOutController.java | 4 ++-- .../cim/idm/service/Impl/InvoiceServiceImpl.java | 13 +++++++++---- .../main/java/com/cim/idm/utils/CommonUtils.java | 2 +- .../main/resources/com/cim/idm/dao/DeliveryDao.xml | 2 +- 7 files changed, 18 insertions(+), 13 deletions(-) diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java index c6254cc..a5b4b1f 100644 --- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java +++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java @@ -583,8 +583,8 @@ public class MESServiceImpl implements MESService{ jsonObject.put("qrCode", list.get(i).get("MATERIALPACKINGNAME")); jsonObject.put("consumableSpecName", list.get(i).get("MATERIALSPECNAME")); jsonObject.put("consumableType", list.get(i).get("MATERIALTYPE")); - String product = list.get(i).get("WO").toString(); - jsonObject.put("productRequestName", product.substring(4)); + String product = list.get(i).get("WO") == null ? "" : list.get(i).get("WO").toString(); + jsonObject.put("productRequestName", product.isEmpty() ? "" : product.substring(4)); jsonObject.put("expiringDate", list.get(i).get("EXPIRINGDATE")); jsonObject.put("productName", list.get(i).get("DESCRIPTION")); jsonObject.put("productStage", list.get(i).get("PHASE")); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java index 7e4e1b4..774e6cf 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java @@ -1955,7 +1955,7 @@ public class InvoiceController { return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } // } - } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType)) {//领料 + } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType) || "06".equals(shipRequestType)) {//领料 if (dy0 < 0) {//只能超发一个 return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } @@ -2139,7 +2139,7 @@ public class InvoiceController { return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } // } - } else if ("01".equals(shipRequestType)) {//领料 + } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType) || "06".equals(shipRequestType)) {//领料 if (dy0 < 0) {//只能超发一个 return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java index a15fc9b..4e1ff77 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java @@ -280,7 +280,7 @@ public class PurchaseReturnController { return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } // } - } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType)) {//领料 + } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType) || "06".equals(shipRequestType)) {//领料 if (dy0 < 0) {//只能超发一个 return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java index 6d412df..66530b2 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java @@ -354,7 +354,7 @@ public class SaleOutController { return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } // } - } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType)) {//领料 + } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType) || "06".equals(shipRequestType)) {//领料 06成品中心领料 if ((allQty.subtract(minusQty)).compareTo(minQty)>0) {//只能超发一个 return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } @@ -567,7 +567,7 @@ public class SaleOutController { return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } // } - } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType)) {//领料 + } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType) || "06".equals(shipRequestType)) {//领料 if (dy0 < 0) {//只能超发一个 return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java index 00fbb97..898ec54 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java @@ -569,7 +569,7 @@ public class InvoiceServiceImpl implements InvoiceService { case "06"://成本中心领料 // billCode=toSAPService.orderStockOut(shipRequestName, "SDK", eventUser,materialPackingKeyList); - billCode=orderStockOut(shipRequestName, "SDK", eventUser,materialPackingKeyList); +// billCode=orderStockOut(shipRequestName, "SDK", eventUser,materialPackingKeyList,commitDate); //抛送MES数据 untils.sendMaterialInfoToMES_NEW(shipRequestName, "", materialPackingKeyList); //更新MES管芯数据 @@ -2271,7 +2271,7 @@ public class InvoiceServiceImpl implements InvoiceService { return undoId; } - public String orderStockOut(String shipRequestName, String siteName, String user,List boxList) throws Exception { + public String orderStockOut(String shipRequestName, String siteName, String user,List boxList,String commitDate) throws Exception { String rcode; String undoId = ""; @@ -2352,10 +2352,15 @@ public class InvoiceServiceImpl implements InvoiceService { */ body.put("ITEM", itemArray); body.put("ITEMID", uniqueID); + + SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat outputFormat = new SimpleDateFormat("yyyyMMdd"); + Date date = inputFormat.parse(commitDate); + String outputDate = outputFormat.format(date); //过账日期 - body.put("BUDAT", TimeStampUtil.getCurrentTime("yyyyMMdd")); + body.put("BUDAT",outputDate); //凭证日期 - body.put("BLDAT", TimeStampUtil.getCurrentTime("yyyyMMdd")); + body.put("BLDAT", outputDate); //凭证抬头文本 body.put("BKTXT", uniqueID); //用户名 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/utils/CommonUtils.java b/zi-wms-pda/src/main/java/com/cim/idm/utils/CommonUtils.java index 3f6456c..ca77411 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/utils/CommonUtils.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/utils/CommonUtils.java @@ -671,7 +671,7 @@ public void SaveUnDoInfo_ForSap(List list, String undoid, EventInfo mak // 定义SQL查询语句，用于获取物料接收位置和接收工厂信息 String sql="SELECT m.ERPRECEIVELOCATION,m.ERPRECEIVEFACTORY FROM MATERIALSHIPREQUEST a,MATERIALSHIPREQUESTDETAIL m \r\n" + " WHERE m.SHIPREQUESTNAME =:SHIPREQUESTNAME and m.SHIPREQUESTNAME=a.SHIPREQUESTNAME " - + " AND a.SHIPREQUESTDETAILTYPE in('311','261')"; + + " AND a.SHIPREQUESTDETAILTYPE in('311','261','201')"; // 创建参数映射，用于执行SQL查询 Map bp=new HashMap<>(); bp.put("SHIPREQUESTNAME", invoiceNo); diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml index 870ac32..c85c0dd 100644 --- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml +++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml @@ -167,7 +167,7 @@ #{name} AND m.SITENAME = #{siteName} - AND m.DELETEDETAILFLAG !='L' + AND (m.DELETEDETAILFLAG IS NULL OR m.DELETEDETAILFLAG !='L') AND m3.IS_BATCH != 'N'