From 4388d3abda2dd6cb87536a92d036193aeac1f815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=85=B4=E8=BE=89?= <lixinghui-b7@boe.com.cn>
Date: Mon, 7 Apr 2025 13:42:59 +0800
Subject: [PATCH] =?UTF-8?q?MES=E7=89=A9=E6=96=99=E6=B6=88=E8=80=97?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../idm/service/Impl/MESToWMSServiceImpl.java | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java
index ea6499d..2db6392 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java
@@ -69,7 +69,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
         loginfo.setEventName("materialConsume_Request");
         String siteName = System.getProperty("company", "SDK");
 
-        Map<String, Object> bindMap = new HashMap<>();
+
         List<String> boxIdList = new ArrayList<>();
         List<String> qtyList = new ArrayList<>();
         List<MaterialPackingKey> mpList = new ArrayList<>();
@@ -90,10 +90,44 @@ public class MESToWMSServiceImpl implements MESToWMSService {
             String qty = jb.get("qty").toString(); // 消耗数量
             wo = jb.get("requestName") == null ? "" : jb.get("requestName").toString(); // 工单
             String flag = jb.get("flag") == null ? "" : jb.get("flag").toString();
+            //判空
+            if (StringUtils.isBlank(materialSpecName) || StringUtils.isBlank(qty)) {
+                result = AjaxResult.me().setSuccess(false).setErrorCode(500).setMessage("参数不能为空");
+                loginfo.setResultCode("1");
+                loginfo.setReturnMsg(JSONObject.toJSONString(result));
+                // 消息保存日志，erp推送wms的数据写入表BS_ERPMESSAGELOG中
+                MessageLogUtil.writeMessageLog(loginfo);
+            }
+            if (StringUtils.isBlank(wo)) {
+                result = AjaxResult.me().setSuccess(false).setErrorCode(500).setMessage("工单不能为空");
+                loginfo.setResultCode("1");
+                loginfo.setReturnMsg(JSONObject.toJSONString(result));
+                // 消息保存日志，erp推送wms的数据写入表BS_ERPMESSAGELOG中
+                MessageLogUtil.writeMessageLog(loginfo);
+            }
             //调用存储MES_CONSUME
-            String procedureName = "CALL  MES_CONSUME('" + wo + "', '" + materialSpecName + "','" + qty + "','" + flag + "'  )";
+            String procedureName = "MES_CONSUME";
             // 调用存储过程返回参数
-            IDMFrameServiceProxy.getSqlTemplate().getJdbcTemplate().execute(procedureName);
+//            IDMFrameServiceProxy.getSqlTemplate().getJdbcTemplate().execute(procedureName);
+            Map<String, Object> bindMap = new HashMap<String, Object>() {
+                {
+                    put("V_WO", materialSpecName);
+                    put("V_MATERIALSPECNAME", materialSpecName);
+                    put("V_QTY", qty);
+                    put("V_FLAG", flag);
+//                    put("V_RETURN_CODE", "");
+//                    put("V_RETURN_MESSAGE", "");
+                }
+            };
+            Map<String, Object> stringObjectMap = IDMFrameServiceProxy.getSqlTemplate().executeProcedure(procedureName, bindMap);
+            if (stringObjectMap != null) {
+                if (stringObjectMap.get("V_RETURN_CODE") != null && !stringObjectMap.get("V_RETURN_CODE").toString().equals("0")) {
+                    errorCode = stringObjectMap.get("V_RETURN_CODE").toString();
+                    String vReturnMessage = stringObjectMap.get("V_RETURN_MESSAGE").toString();
+                    log.error("MES_CONSUME返回错误码：" + errorCode + "，错误信息：" + vReturnMessage);
+                    result = AjaxResult.me().setSuccess(false).setErrorCode(Integer.parseInt(errorCode)).setMessage(vReturnMessage);
+                }
+            }
 
 
         }