箱变修改到货单质检

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

@@ -27,6 +27,7 @@ import nc.vo.bd.psn.PsndocVO;
 import nc.vo.bd.supplier.SupplierVersionVO;
 import nc.vo.ml.NCLangRes4VoTransl;
 import nc.vo.org.OrgVO;
+import nc.vo.pmpub.project.ProjectHeadVO;
 import nc.vo.pu.m23.entity.ArriveHeaderVO;
 import nc.vo.pu.m23.entity.ArriveItemVO;
 import nc.vo.pu.m23.entity.ArriveVO;
@@ -232,6 +233,31 @@ public class QCAction implements ICommonAction {
                 itemObj.put("bz",  getBz(bvo,reportItemVO.getCfirstbid())); // 明细备注，用于填写该送检物料的补充说明
                 itemObj.put("bipzyid", pkReportbill); // 质检报告ID
                 itemObj.put("bipqdid", reportItemVO.getPk_reportbill_b()); // 质检报告明细ID
+                String projectId = (String) getProject(bvo,reportItemVO.getCfirstbid());
+                if(projectId != null) {
+                    String projectName = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_NAME,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    String projectcode = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_CODE,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    // 查找编码a在b中的位置
+                    int index = projectName.indexOf(projectcode);
+                    String remaining ="";
+                    // 如果不包含编码a，直接返回b（此时b是单纯的名称）
+                    if (index != 0) {
+                        remaining=projectName;
+                    }else{
+                        remaining = projectName.substring(projectcode.length());
+                    }
+
+                    // String[] codeandnames = projectName.split(" ");
+                    itemObj.put("xshth", projectcode); // 销售合同号
+                    itemObj.put("xmmc", remaining); //项目名称
+                }else{
+                    itemObj.put("xshth", ""); // 销售合同号
+                    itemObj.put("xmmc", ""); //项目名称
+                }
                 contentArray.add(itemObj);
             }
             singleObj.put("Content", contentArray);
@@ -241,6 +267,14 @@ public class QCAction implements ICommonAction {
         }
 
     }
+    private Object getProject(ArriveItemVO[] bvo, String cfirstbid) {
+        for (ArriveItemVO arriveItemVO : bvo) {
+            if(arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {
+                return arriveItemVO.getCprojectid();
+            }
+        }
+        return null;
+    }
     private Object getBz(ArriveItemVO[] bvo, String cfirstbid) {
         for (ArriveItemVO arriveItemVO : bvo) {
             if(arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {

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

@@ -24,6 +24,7 @@ import nc.vo.bd.material.measdoc.MeasdocVO;
 import nc.vo.bd.psn.PsndocVO;
 import nc.vo.bd.supplier.SupplierVersionVO;
 import nc.vo.org.OrgVO;
+import nc.vo.pmpub.project.ProjectHeadVO;
 import nc.vo.pu.m23.entity.ArriveHeaderVO;
 import nc.vo.pu.m23.entity.ArriveItemVO;
 import nc.vo.pu.m23.entity.ArriveVO;
@@ -170,6 +171,31 @@ public class QCRptDataPushtoQmsAction implements ICommonAction {
                 itemObj.put("bz",  getBz(bvo,reportItemVO.getCfirstbid())); // 明细备注，用于填写该送检物料的补充说明
                 itemObj.put("bipzyid", pkReportbill); // 质检报告ID
                 itemObj.put("bipqdid", reportItemVO.getPk_reportbill_b()); // 质检报告明细ID
+                String projectId = (String) getProject(bvo,reportItemVO.getCfirstbid());
+                if(projectId != null) {
+                    String projectName = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_NAME,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    String projectcode = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_CODE,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    // 查找编码a在b中的位置
+                    int index = projectName.indexOf(projectcode);
+                    String remaining ="";
+                    // 如果不包含编码a，直接返回b（此时b是单纯的名称）
+                    if (index != 0) {
+                        remaining=projectName;
+                    }else{
+                        remaining = projectName.substring(projectcode.length());
+                    }
+
+                    // String[] codeandnames = projectName.split(" ");
+                    itemObj.put("xshth", projectcode); // 销售合同号
+                    itemObj.put("xmmc", remaining); //项目名称
+                }else{
+                    itemObj.put("xshth", ""); // 销售合同号
+                    itemObj.put("xmmc", ""); //项目名称
+                }
                 contentArray.add(itemObj);
             }
             singleObj.put("Content", contentArray);
@@ -182,6 +208,14 @@ public class QCRptDataPushtoQmsAction implements ICommonAction {
         }
 
     }
+    private Object getProject(ArriveItemVO[] bvo, String cfirstbid) {
+        for (ArriveItemVO arriveItemVO : bvo) {
+            if(arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {
+                return arriveItemVO.getCprojectid();
+            }
+        }
+        return null;
+    }
     private Object getBz(ArriveItemVO[] bvo, String cfirstbid) {
         for (ArriveItemVO arriveItemVO : bvo) {
             if(arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {

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

@@ -21,6 +21,7 @@ import nc.vo.bd.material.measdoc.MeasdocVO;
 import nc.vo.bd.psn.PsndocVO;
 import nc.vo.bd.supplier.SupplierVersionVO;
 import nc.vo.org.OrgVO;
+import nc.vo.pmpub.project.ProjectHeadVO;
 import nc.vo.pu.m23.entity.ArriveHeaderVO;
 import nc.vo.pu.m23.entity.ArriveItemVO;
 import nc.vo.pu.m23.entity.ArriveVO;
@@ -366,6 +367,31 @@ public class QualityCheckAction implements ICommonAction {
                 itemObj.put("bz",  getBz(bvo,reportItemVO.getCfirstbid())); // 明细备注，用于填写该送检物料的补充说明
                 itemObj.put("bipzyid", pkReportbill); // 质检报告ID
                 itemObj.put("bipqdid", reportItemVO.getPk_reportbill_b()); // 质检报告明细ID
+                String projectId = (String) getProject(bvo,reportItemVO.getCfirstbid());
+                if(projectId != null) {
+                    String projectName = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_NAME,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    String projectcode = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_CODE,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    // 查找编码a在b中的位置
+                    int index = projectName.indexOf(projectcode);
+                    String remaining ="";
+                    // 如果不包含编码a，直接返回b（此时b是单纯的名称）
+                    if (index != 0) {
+                        remaining=projectName;
+                    }else{
+                        remaining = projectName.substring(projectcode.length());
+                    }
+
+                    // String[] codeandnames = projectName.split(" ");
+                    itemObj.put("xshth", projectcode); // 销售合同号
+                    itemObj.put("xmmc", remaining); //项目名称
+                }else{
+                    itemObj.put("xshth", ""); // 销售合同号
+                    itemObj.put("xmmc", ""); //项目名称
+                }
                 contentArray.add(itemObj);
             }
             singleObj.put("Content", contentArray);
@@ -375,6 +401,14 @@ public class QualityCheckAction implements ICommonAction {
         }
 
     }
+    private Object getProject(ArriveItemVO[] bvo, String cfirstbid) {
+        for (ArriveItemVO arriveItemVO : bvo) {
+            if(arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {
+                return arriveItemVO.getCprojectid();
+            }
+        }
+        return null;
+    }
     private Object getBz(ArriveItemVO[] bvo, String cfirstbid) {
         for (ArriveItemVO arriveItemVO : bvo) {
             if(arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {

pu/src/client/nccloud/web/pu/arrivalqc/action/QualityCheckAction.java

@@ -21,6 +21,7 @@ import nc.vo.bd.material.measdoc.MeasdocVO;
 import nc.vo.bd.psn.PsndocVO;
 import nc.vo.bd.supplier.SupplierVersionVO;
 import nc.vo.org.OrgVO;
+import nc.vo.pmpub.project.ProjectHeadVO;
 import nc.vo.pu.m23.entity.ArriveHeaderVO;
 import nc.vo.pu.m23.entity.ArriveItemVO;
 import nc.vo.pu.m23.entity.ArriveVO;
@@ -378,6 +379,31 @@ public class QualityCheckAction implements ICommonAction {
                 itemObj.put("bz",  getBz(bvo,reportItemVO.getCfirstbid())); // 明细备注，用于填写该送检物料的补充说明
                 itemObj.put("bipzyid", pkReportbill); // 质检报告ID
                 itemObj.put("bipqdid", reportItemVO.getPk_reportbill_b()); // 质检报告明细ID
+                String projectId = (String) getProject(bvo,reportItemVO.getCfirstbid());
+                if(projectId != null) {
+                    String projectName = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_NAME,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    String projectcode = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_CODE,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    // 查找编码a在b中的位置
+                    int index = projectName.indexOf(projectcode);
+                    String remaining ="";
+                    // 如果不包含编码a，直接返回b（此时b是单纯的名称）
+                    if (index != 0) {
+                        remaining=projectName;
+                    }else{
+                        remaining = projectName.substring(projectcode.length());
+                    }
+
+                    // String[] codeandnames = projectName.split(" ");
+                    itemObj.put("xshth", projectcode); // 销售合同号
+                    itemObj.put("xmmc", remaining); //项目名称
+                }else{
+                    itemObj.put("xshth", ""); // 销售合同号
+                    itemObj.put("xmmc", ""); //项目名称
+                }
                 contentArray.add(itemObj);
             }
             singleObj.put("Content", contentArray);
@@ -387,6 +413,14 @@ public class QualityCheckAction implements ICommonAction {
         }
 
     }
+    private Object getProject(ArriveItemVO[] bvo, String cfirstbid) {
+        for (ArriveItemVO arriveItemVO : bvo) {
+            if(arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {
+                return arriveItemVO.getCprojectid();
+            }
+        }
+        return null;
+    }
     private Object getBz(ArriveItemVO[] bvo, String cfirstbid) {
         for (ArriveItemVO arriveItemVO : bvo) {
             if(arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {

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

@@ -25,6 +25,7 @@ import nc.vo.bd.psn.PsndocVO;
 import nc.vo.bd.supplier.SupplierVersionVO;
 import nc.vo.ml.NCLangRes4VoTransl;
 import nc.vo.org.OrgVO;
+import nc.vo.pmpub.project.ProjectHeadVO;
 import nc.vo.pu.m23.entity.ArriveHeaderVO;
 import nc.vo.pu.m23.entity.ArriveItemVO;
 import nc.vo.pu.m23.entity.ArriveVO;
@@ -173,6 +174,31 @@ public class QCRptDataPushtoQmsAction implements ICommonAction {
                 itemObj.put("bz",  getBz(bvo,reportItemVO.getCfirstbid())); // 明细备注，用于填写该送检物料的补充说明
                 itemObj.put("bipzyid", pkReportbill); // 质检报告ID
                 itemObj.put("bipqdid", reportItemVO.getPk_reportbill_b()); // 质检报告明细ID
+                String projectId = (String) getProject(bvo,reportItemVO.getCfirstbid());
+                if(projectId != null) {
+                    String projectName = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_NAME,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    String projectcode = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_CODE,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    // 查找编码a在b中的位置
+                    int index = projectName.indexOf(projectcode);
+                    String remaining ="";
+                    // 如果不包含编码a，直接返回b（此时b是单纯的名称）
+                    if (index != 0) {
+                        remaining=projectName;
+                    }else{
+                        remaining = projectName.substring(projectcode.length());
+                    }
+
+                    // String[] codeandnames = projectName.split(" ");
+                    itemObj.put("xshth", projectcode); // 销售合同号
+                    itemObj.put("xmmc", remaining); //项目名称
+                }else{
+                    itemObj.put("xshth", ""); // 销售合同号
+                    itemObj.put("xmmc", ""); //项目名称
+                }
                 contentArray.add(itemObj);
             }
             singleObj.put("Content", contentArray);
@@ -182,6 +208,14 @@ public class QCRptDataPushtoQmsAction implements ICommonAction {
         }
 
     }
+    private Object getProject(ArriveItemVO[] bvo, String cfirstbid) {
+        for (ArriveItemVO arriveItemVO : bvo) {
+            if(arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {
+                return arriveItemVO.getCprojectid();
+            }
+        }
+        return null;
+    }
     private Object getBz(ArriveItemVO[] bvo, String cfirstbid) {
         for (ArriveItemVO arriveItemVO : bvo) {
             if(arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {

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

@@ -20,6 +20,7 @@ import nc.vo.bd.material.measdoc.MeasdocVO;
 import nc.vo.bd.psn.PsndocVO;
 import nc.vo.bd.supplier.SupplierVersionVO;
 import nc.vo.org.OrgVO;
+import nc.vo.pmpub.project.ProjectHeadVO;
 import nc.vo.pu.m23.entity.ArriveHeaderVO;
 import nc.vo.pu.m23.entity.ArriveItemVO;
 import nc.vo.pu.m23.entity.ArriveVO;
@@ -176,6 +177,31 @@ public class SyncDeleteQcQmsRule implements IRule<ReportVO> {
                 itemObj.put("bz", getBz(bvo,reportItemVO.getCfirstbid())); // 明细备注 送货单备注
                 itemObj.put("bipzyid", pkReportbill); // 质检报告ID
                 itemObj.put("bipqdid", reportItemVO.getPk_reportbill_b()); // 质检报告明细ID
+                String projectId = (String) getProject(bvo,reportItemVO.getCfirstbid());
+                if(projectId != null) {
+                    String projectName = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_NAME,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    String projectcode = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_CODE,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    // 查找编码a在b中的位置
+                    int index = projectName.indexOf(projectcode);
+                    String remaining ="";
+                    // 如果不包含编码a，直接返回b（此时b是单纯的名称）
+                    if (index != 0) {
+                        remaining=projectName;
+                    }else{
+                        remaining = projectName.substring(projectcode.length());
+                    }
+
+                    // String[] codeandnames = projectName.split(" ");
+                    itemObj.put("xshth", projectcode); // 销售合同号
+                    itemObj.put("xmmc", remaining); //项目名称
+                }else{
+                    itemObj.put("xshth", ""); // 销售合同号
+                    itemObj.put("xmmc", ""); //项目名称
+                }
                 contentArray.add(itemObj);
             }
             singleObj.put("Content", contentArray);
@@ -183,6 +209,14 @@ public class SyncDeleteQcQmsRule implements IRule<ReportVO> {
             updateArrveOrder(hvo.getPk_arriveorder());
         }
     }
+    private Object getProject(ArriveItemVO[] bvo, String cfirstbid) {
+        for (ArriveItemVO arriveItemVO : bvo) {
+            if(arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {
+                return arriveItemVO.getCprojectid();
+            }
+        }
+        return null;
+    }
     private void updateArrveOrder(String pkArriveorder) throws DAOException {
         BaseDAO dao = new BaseDAO();
         String sql = "update po_arriveorder_b set vbdef32='Y' where pk_arriveorder='"

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

@@ -20,6 +20,7 @@ import nc.vo.bd.material.measdoc.MeasdocVO;
 import nc.vo.bd.psn.PsndocVO;
 import nc.vo.bd.supplier.SupplierVersionVO;
 import nc.vo.org.OrgVO;
+import nc.vo.pmpub.project.ProjectHeadVO;
 import nc.vo.pu.m23.entity.ArriveHeaderVO;
 import nc.vo.pu.m23.entity.ArriveItemVO;
 import nc.vo.pu.m23.entity.ArriveVO;
@@ -144,6 +145,31 @@ public class SyncQcQmsRule implements IRule<ReportVO> {
                 itemObj.put("bz", getBz(bvo, reportItemVO.getCfirstbid())); // 明细备注，送货单备注
                 itemObj.put("bipzyid", pkReportbill); // 质检报告ID
                 itemObj.put("bipqdid", reportItemVO.getPk_reportbill_b()); // 质检报告明细ID
+                String projectId = (String) getProject(bvo,reportItemVO.getCfirstbid());
+                if(projectId != null) {
+                    String projectName = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_NAME,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    String projectcode = MyHelper.getStrValByCondition("bd_project", ProjectHeadVO.PROJECT_CODE,
+                            ProjectHeadVO.PK_PROJECT + " = '" + projectId + "'");
+
+                    // 查找编码a在b中的位置
+                    int index = projectName.indexOf(projectcode);
+                    String remaining ="";
+                    // 如果不包含编码a，直接返回b（此时b是单纯的名称）
+                    if (index != 0) {
+                        remaining=projectName;
+                    }else{
+                        remaining = projectName.substring(projectcode.length());
+                    }
+
+                    // String[] codeandnames = projectName.split(" ");
+                    itemObj.put("xshth", projectcode); // 销售合同号
+                    itemObj.put("xmmc", remaining); //项目名称
+                }else{
+                    itemObj.put("xshth", ""); // 销售合同号
+                    itemObj.put("xmmc", ""); //项目名称
+                }
                 contentArray.add(itemObj);
             }
             singleObj.put("Content", contentArray);
@@ -151,6 +177,14 @@ public class SyncQcQmsRule implements IRule<ReportVO> {
             updateArrveOrder(hvo.getPk_arriveorder());
         }
     }
+    private Object getProject(ArriveItemVO[] bvo, String cfirstbid) {
+        for (ArriveItemVO arriveItemVO : bvo) {
+            if(arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {
+                return arriveItemVO.getCprojectid();
+            }
+        }
+        return null;
+    }
 
     private void updateArrveOrder(String pkArriveorder) throws DAOException {
         BaseDAO dao = new BaseDAO();