yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
mzr 2025-10-26 19:39:27 +08:00
parent b09d397893
commit fb76ce3647
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pu/src/client/nccloud/web/pu/arrival/action/QCRptDataPushtoQmsAction.java
View File

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

5
qc/src/client/nccloud/web/qc/qcconclusion/action/QCRptDataPushtoQmsAction.java
View File

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

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

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

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

@ -141,7 +141,7 @@ public class SyncQcQmsRule implements IRule<ReportVO> {
itemObj.put("wlxhgg", materialtype + materialspec); // 物料型号规格 itemObj.put("wlxhgg", materialtype + materialspec); // 物料型号规格
itemObj.put("sjsl", reportHeaderVO.getNapplynum().toString()); // 送检数量（设计单位），按设计计量单位统计的送检数量 itemObj.put("sjsl", reportHeaderVO.getNapplynum().toString()); // 送检数量（设计单位），按设计计量单位统计的送检数量
itemObj.put("jldw", cunitname); // 计量单位 itemObj.put("jldw", cunitname); // 计量单位
itemObj.put("bz", getBz(bvo,reportItemVO.getCfirstbid())); // 明细备注，送货单备注 itemObj.put("bz", getBz(bvo, reportItemVO.getCfirstbid())); // 明细备注，送货单备注
itemObj.put("bipzyid", pkReportbill); // 质检报告ID itemObj.put("bipzyid", pkReportbill); // 质检报告ID
itemObj.put("bipqdid", reportItemVO.getPk_reportbill_b()); // 质检报告明细ID itemObj.put("bipqdid", reportItemVO.getPk_reportbill_b()); // 质检报告明细ID
contentArray.add(itemObj); contentArray.add(itemObj);
@ -151,15 +151,17 @@ public class SyncQcQmsRule implements IRule<ReportVO> {
updateArrveOrder(hvo.getPk_arriveorder()); updateArrveOrder(hvo.getPk_arriveorder());
} }
} }
private void updateArrveOrder(String pkArriveorder) throws DAOException { private void updateArrveOrder(String pkArriveorder) throws DAOException {
BaseDAO dao = new BaseDAO(); BaseDAO dao = new BaseDAO();
String sql = "update po_arriveorder_b set vbdef32='Y' where pk_arriveorder='" String sql = "update po_arriveorder_b set vbdef32='Y' where pk_arriveorder='"
+ pkArriveorder + "'"; + pkArriveorder + "'";
dao.executeUpdate(sql); dao.executeUpdate(sql);
} }
private Object getBz(ArriveItemVO[] bvo, String cfirstbid) { private Object getBz(ArriveItemVO[] bvo, String cfirstbid) {
for (ArriveItemVO arriveItemVO : bvo) { for (ArriveItemVO arriveItemVO : bvo) {
if(arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) { if (arriveItemVO.getPk_arriveorder_b().equals(cfirstbid)) {
return arriveItemVO.getVmemob(); return arriveItemVO.getVmemob();
} }
} }
@ -223,10 +225,13 @@ public class SyncQcQmsRule implements IRule<ReportVO> {
} }
private boolean checkIfOrg(String code, Map<String, String> configParams) throws BusinessException { 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)) { if (targetCode == null || StringUtils.isEmpty(targetCode)) {
throw new BusinessException("未配置组织参数"); throw new BusinessException("未配置组织参数");
} }
if (targetCode.contains("qc-")) {
targetCode = targetCode.replace("qc-", "");
}
String[] orgItem = targetCode.split(","); String[] orgItem = targetCode.split(",");
for (String orgCode : orgItem) { for (String orgCode : orgItem) {
if (!orgCode.isEmpty() && orgCode.equals(code)) { if (!orgCode.isEmpty() && orgCode.equals(code)) {