箱变质检报告推启源调整组织判断

pu/src/client/nccloud/web/pu/arrival/action/QCRptDataPushtoQmsAction.java

@@ -250,10 +250,13 @@ public class QCRptDataPushtoQmsAction implements ICommonAction {
     }
 
     private boolean checkIfOrg(String code, Map<String, String> configParams) throws BusinessException {
-        String targetCode = configParams.get("xbOrg");
+        String targetCode = configParams.get("xbqcOrg");
         if (targetCode == null || StringUtils.isEmpty(targetCode)) {
             throw new BusinessException("未配置组织参数");
         }
+        if (targetCode.contains("qc-")) {
+            targetCode = targetCode.replace("qc-", "");
+        }
         String[] orgItem = targetCode.split(",");
         for (String orgCode : orgItem) {
             if (!orgCode.isEmpty() && orgCode.equals(code)) {

qc/src/client/nccloud/web/qc/qcconclusion/action/QCRptDataPushtoQmsAction.java

@@ -254,10 +254,13 @@ public class QCRptDataPushtoQmsAction implements ICommonAction {
     }
 
     private boolean checkIfOrg(String code, Map<String, String> configParams) throws BusinessException {
-        String targetCode = configParams.get("xbOrg");
+        String targetCode = configParams.get("xbqcOrg");
         if (targetCode == null || StringUtils.isEmpty(targetCode)) {
             throw new BusinessException("未配置组织参数");
         }
+        if (targetCode.contains("qc-")) {
+            targetCode = targetCode.replace("qc-", "");
+        }
         String[] orgItem = targetCode.split(",");
         for (String orgCode : orgItem) {
             if (!orgCode.isEmpty() && orgCode.equals(code)) {

qc/src/private/nc/bs/qc/c003/maintain/rule/SyncDeleteQcQmsRule.java

@@ -249,10 +249,13 @@ public class SyncDeleteQcQmsRule implements IRule<ReportVO> {
     }
 
     private boolean checkIfOrg(String code, Map<String, String> configParams) throws BusinessException {
-        String targetCode = configParams.get("xbOrg");
+        String targetCode = configParams.get("xbqcOrg");
         if (targetCode == null || StringUtils.isEmpty(targetCode)) {
             throw new BusinessException("未配置组织参数");
         }
+        if (targetCode.contains("qc-")) {
+            targetCode = targetCode.replace("qc-", "");
+        }
         String[] orgItem = targetCode.split(",");
         for (String orgCode : orgItem) {
             if (!orgCode.isEmpty() && orgCode.equals(code)) {

qc/src/private/nc/bs/qc/c003/maintain/rule/SyncQcQmsRule.java

@@ -151,12 +151,14 @@ public class SyncQcQmsRule implements IRule<ReportVO> {
             updateArrveOrder(hvo.getPk_arriveorder());
         }
     }
+
     private void updateArrveOrder(String pkArriveorder) throws DAOException {
         BaseDAO dao = new BaseDAO();
         String sql = "update po_arriveorder_b set vbdef32='Y' where pk_arriveorder='"
                 + pkArriveorder + "'";
         dao.executeUpdate(sql);
     }
+
     private Object getBz(ArriveItemVO[] bvo, String cfirstbid) {
         for (ArriveItemVO arriveItemVO : bvo) {
             if (arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {
@@ -223,10 +225,13 @@ public class SyncQcQmsRule implements IRule<ReportVO> {
     }
 
     private boolean checkIfOrg(String code, Map<String, String> configParams) throws BusinessException {
-        String targetCode = configParams.get("xbOrg");
+        String targetCode = configParams.get("xbqcOrg");
         if (targetCode == null || StringUtils.isEmpty(targetCode)) {
             throw new BusinessException("δÅäÖÃ×éÖ¯²ÎÊý");
         }
+        if (targetCode.contains("qc-")) {
+            targetCode = targetCode.replace("qc-", "");
+        }
         String[] orgItem = targetCode.split(",");
         for (String orgCode : orgItem) {
             if (!orgCode.isEmpty() && orgCode.equals(code)) {