From 941dec1543344041466c5d995002bb5ab8ab7ceb Mon Sep 17 00:00:00 2001
From: maolei <maolei01@yonyou.com>
Date: Fri, 6 Jun 2025 11:13:04 +0800
Subject: [PATCH] =?UTF-8?q?mmpac=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=91=8A:=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20MES=20=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 preProcessMesData 方法预处理 MES 数据
- 实现 processMESFields 方法自动赋值 MES 相关字段
- 添加 processWarehouseConversion 方法处理仓库转换逻辑
-优化 convertWarehouseCodeToPk 方法查询仓库主键
---
 .../nccloud/openapi/mmpac/wr/WrResource.java  | 186 ++++++++++++++++--
 1 file changed, 171 insertions(+), 15 deletions(-)

diff --git a/mmpac/src/public/nccloud/openapi/mmpac/wr/WrResource.java b/mmpac/src/public/nccloud/openapi/mmpac/wr/WrResource.java
index e291e10..7e640e9 100644
--- a/mmpac/src/public/nccloud/openapi/mmpac/wr/WrResource.java
+++ b/mmpac/src/public/nccloud/openapi/mmpac/wr/WrResource.java
@@ -1,18 +1,18 @@
 package nccloud.openapi.mmpac.wr;
 
+
 import nc.bs.dao.BaseDAO;
+import nc.bs.framework.common.InvocationInfoProxy;
 import nc.bs.framework.common.NCLocator;
 import nc.bs.logging.Log;
 import nc.bs.uif2.validation.ValidationFailure;
+import nc.jdbc.framework.SQLParameter;
+import nc.jdbc.framework.processor.ColumnProcessor;
 import nc.util.mmf.framework.base.MMArrayUtil;
 import nc.util.mmf.framework.base.MMCollectionUtil;
 import nc.util.mmf.framework.base.MMNumberUtil;
 import nc.util.mmf.framework.base.MMValueCheck;
-import nc.vo.mmpac.wr.entity.AggWrVO;
-import nc.vo.mmpac.wr.entity.WrItemVO;
-import nc.vo.mmpac.wr.entity.WrQualityVO;
-import nc.vo.mmpac.wr.entity.WrSerialNoVO;
-import nc.vo.mmpac.wr.entity.WrVO;
+import nc.vo.mmpac.wr.entity.*;
 import nc.vo.mmpac.wr.enumeration.WrBillStatusEnum;
 import nc.vo.pub.BusinessException;
 import nc.vo.pub.VOStatus;
@@ -31,14 +31,7 @@ import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 @Path("mmpac/wr")
 public class WrResource extends AbstractNCCRestResource {
@@ -312,6 +305,9 @@ public class WrResource extends AbstractNCCRestResource {
                     Map<String, Object> bodyInfo = (Map<String, Object>) paramMap.get(BODYTABLE);
                     itemInfos.add(bodyInfo);
                 }
+
+                // Ԥ�������ݣ������ֿ�ת����MES����ֶ�
+                preProcessMesData(headInfo, itemInfos, baseDAO);
                 AggWrVO vo = new AggWrVO();
                 WrVO head = new WrVO();
                 head.setPk_group(AppContext.getInstance().getPkGroup());
@@ -577,9 +573,169 @@ public class WrResource extends AbstractNCCRestResource {
             }
             server.delete(deleteVos.toArray(new AggWrVO[0]));
             return ResultMessageUtil.toJSON(new String[0], "��������ɾ���ɹ�");
-        } catch (Exception e) {
-            return ResultMessageUtil.exceptionToJSON(e);
+        } catch (Exception e) {        return ResultMessageUtil.exceptionToJSON(e);
         }
     }
 
+    /**
+     * Ԥ�������ݣ������ֿ�ת����MES����ֶδ���
+     * @param headInfo ��ͷ��Ϣ
+     * @param itemInfos ������Ϣ�б�
+     * @param baseDAO ���ݿ��������
+     * @throws BusinessException ����ʧ��ʱ�׳��쳣
+     */
+    private void preProcessMesData(Map<String, Object> headInfo, List<Map<String, Object>> itemInfos, BaseDAO baseDAO)
+            throws BusinessException {
+        // ����������Ϣ�е�����ת��
+        for (Map<String, Object> itemMap : itemInfos) {
+            // ����MES����ֶ��Զ���ֵ
+            processMESFields(itemMap, baseDAO);
+            
+            // ����������Ϣ�еIJֿ�ת��
+            if (itemMap.containsKey(QUALITYTABLE)) {
+                List<Map<String, Object>> qualityInfos = (List<Map<String, Object>>) itemMap.get(QUALITYTABLE);
+                processWarehouseConversion(qualityInfos, baseDAO);
+            }
+        }
+    }
+    
+    /**
+     * ����MES����ֶ��Զ���ֵ
+     * ����û�code��MES����ô��cbmoid���ֺ�vbsrcidһ�£�cbmobid���ֺ�vbsrcrowidһ��
+     * ����vbmobillcode���ݺţ�ͨ��cbmoid��ѯ����������������vbillcode
+     * @param itemMap ������Ϣ
+     * @param baseDAO ���ݿ��������
+     * @throws BusinessException ��ѯʧ��ʱ�׳��쳣
+     */
+
+    private void processMESFields(Map<String, Object> itemMap, BaseDAO baseDAO) throws BusinessException {
+        // ����Ƿ���Ҫ����MES�ֶ�
+        // �������ͨ�������ġ��û���Ϣ��������ʶ���ж�
+        // ��ʱͨ������Ƿ�����ض��ֶ����ж���MES�û�
+        boolean isMESUser = isMESUser(itemMap);
+        
+        if (!isMESUser) {
+            return;
+        }
+        
+        try {
+            // ����cbmoid���ֺ�vbsrcidһ��
+            if (itemMap.containsKey("vbsrcid") && MMValueCheck.isNotEmpty(itemMap.get("vbsrcid"))) {
+                itemMap.put("cbmoid", itemMap.get("vbsrcid"));
+            }
+            
+            // ����cbmobid���ֺ�vbsrcrowidһ��
+            if (itemMap.containsKey("vbsrcrowid") && MMValueCheck.isNotEmpty(itemMap.get("vbsrcrowid"))) {
+                itemMap.put("cbmobid", itemMap.get("vbsrcrowid"));
+            }
+              // ͨ��cbmoid��ѯ����������������vbillcode
+            if (itemMap.containsKey("cbmoid") && MMValueCheck.isNotEmpty(itemMap.get("cbmoid"))) {
+                String cbmoid = String.valueOf(itemMap.get("cbmoid"));
+                String sql = "SELECT vbillcode FROM mm_pmo WHERE cpmohid = ? AND dr = 0";
+                SQLParameter param = new SQLParameter();
+                param.addParam(cbmoid);
+                String vbillcode = (String) baseDAO.executeQuery(sql, param, new ColumnProcessor());
+                
+                if (MMValueCheck.isEmpty(vbillcode)) {
+                    throw new BusinessException("ͨ��������������������" + cbmoid + "����ѯ������Ӧ�ĵ��ݺţ���������");
+                }
+                
+                itemMap.put("vbmobillcode", vbillcode);
+            }
+            
+        } catch (Exception e) {
+            if (e instanceof BusinessException) {
+                throw e;
+            }
+            throw new BusinessException("����MES�ֶ�ʧ�ܣ�" + e.getMessage());
+        }
+    }
+      /**
+     * �ж��Ƿ�ΪMES�û�
+     * ͨ����ȡ�߳��������е��û��������ж��Ƿ�ΪMES�û�
+     * @param itemMap ������Ϣ�����������Ա��ַ���ǩ��һ���ԣ�
+     * @return �Ƿ�ΪMES�û�
+     */
+
+    private boolean isMESUser(Map<String, Object> itemMap) {
+        try {
+            // ��ȡ��ǰ�߳��������е��û�����
+            String userCode = InvocationInfoProxy.getInstance().getUserCode();
+            
+            // �ж��û������Ƿ�ΪMES
+            return "MES".equals(userCode);
+            
+        } catch (Exception e) {
+            // �����ȡ�û�����ʧ�ܣ���¼��־������false
+            Log.getInstance("mm-mes").error("��ȡ�û�����ʧ�ܣ�" + e.getMessage(), e);
+            return false;
+        }
+    }
+    
+    /**
+     * �����ֿ�ת������ԭ�еIJֿ�ת���߼���װ�ɶ���������
+     * @param qualityInfos ������Ϣ�б�
+     * @param baseDAO ���ݿ��������
+     * @throws BusinessException ת��ʧ��ʱ�׳��쳣
+     */
+    private void processWarehouseConversion(List<Map<String, Object>> qualityInfos, BaseDAO baseDAO) 
+            throws BusinessException {
+        if (qualityInfos == null || qualityInfos.isEmpty()) {
+            return;
+        }
+        
+        for (Map<String, Object> qualityInfo : qualityInfos) {
+            if (qualityInfo.containsKey("cgwarehouseid") && MMValueCheck.isNotEmpty(qualityInfo.get("cgwarehouseid"))) {
+                String warehouseValue = String.valueOf(qualityInfo.get("cgwarehouseid"));
+                String warehousePk = convertWarehouseCodeToPk(warehouseValue, baseDAO);
+                qualityInfo.put("cgwarehouseid", warehousePk);
+            }
+        }
+    }
+
+    /**
+     * ת���ֿ����Ϊ����
+     * ���ȼ��贫��ֵ�������������ѯ�������ټ����DZ�����в�ѯ
+     * @param warehouseValue �ֿ�ֵ����������������룩
+     * @param baseDAO ���ݿ��������
+     * @return �ֿ�����
+     * @throws BusinessException ����ֿⲻ����
+     */
+    private String convertWarehouseCodeToPk(String warehouseValue, BaseDAO baseDAO) throws BusinessException {
+        if (MMValueCheck.isEmpty(warehouseValue)) {
+            return warehouseValue;
+        }
+        try {
+            // ���ȼ�����������ֱ�Ӳ�ѯ
+            String sql = "SELECT pk_stordoc FROM bd_stordoc WHERE pk_stordoc = ? AND dr = 0";
+            SQLParameter param = new SQLParameter();
+            param.addParam(warehouseValue);
+            String result = (String) baseDAO.executeQuery(sql, param, new ColumnProcessor());
+
+            if (MMValueCheck.isNotEmpty(result)) {
+                // ������ѯ�ɹ���ֱ�ӷ���
+                return warehouseValue;
+            }
+
+            // ������ѯʧ�ܣ������DZ����ѯ
+            sql = "SELECT pk_stordoc FROM bd_stordoc WHERE code = ? AND dr = 0";
+            param = new SQLParameter();
+            param.addParam(warehouseValue);
+            result = (String) baseDAO.executeQuery(sql, param, new ColumnProcessor());
+
+            if (MMValueCheck.isNotEmpty(result)) {
+                // �����ѯ�ɹ�����������
+                return result;
+            }
+
+            // ����ѯ�������׳��쳣
+            throw new BusinessException("�ֿ⡾" + warehouseValue + "�������ڣ�����ֿ���������");
+
+        } catch (Exception e) {
+            if (e instanceof BusinessException) {
+                throw e;
+            }
+            throw new BusinessException("��ѯ�ֿ���Ϣʧ�ܣ�" + e.getMessage());
+        }
+    }
 }