Merge remote-tracking branch 'origin/main'

This commit is contained in:
lihao 2025-10-15 18:26:17 +08:00
commit d706eb9675
1 changed files with 12 additions and 2 deletions

View File

@ -109,7 +109,12 @@ public class AfterSoSyncRuleGyMes implements IRule<SaleOrderVO> {
Map<String, Object> mrlMap = (Map<String, Object>) baseDAO.executeQuery(wlsql, new MapProcessor());
JSONObject itemObj = new JSONObject();
itemObj.put("contractNum", contractNum);// ºÏͬ±àÂë
// itemObj.put("contractNum", contractNum);// ºÏͬ±àÂë
// »ñÈ¡ÏîÄ¿±àÂë
String cprojectid = item.getCprojectid();// ÏîÄ¿id
String projectCode = MyHelper.getStrValByCondition(ProjectHeadVO.getDefaultTableName(), ProjectHeadVO.PROJECT_CODE,
ProjectHeadVO.PK_PROJECT + " = '" + cprojectid + "'");
itemObj.put("contractNum", projectCode);// ÏîÄ¿±àÂë
itemObj.put("bipOrderId", hvo.getVbillcode());// 饋簡땐데뵀
itemObj.put("bipId", item.getCsaleorderbid());// 寮숩ID
itemObj.put("entryName", projectName);// 淃커츰냔
@ -143,7 +148,12 @@ public class AfterSoSyncRuleGyMes implements IRule<SaleOrderVO> {
Map<String, Object> mrlMap = (Map<String, Object>) baseDAO.executeQuery(wlsql, new MapProcessor());
JSONObject itemObj = new JSONObject();
itemObj.put("contractNum", contractNum);// ºÏͬ±àÂë
// itemObj.put("contractNum", contractNum);// ºÏͬ±àÂë
// »ñÈ¡ÏîÄ¿±àÂë
String cprojectid = item.getCprojectid();// ÏîÄ¿id
String projectCode = MyHelper.getStrValByCondition(ProjectHeadVO.getDefaultTableName(), ProjectHeadVO.PROJECT_CODE,
ProjectHeadVO.PK_PROJECT + " = '" + cprojectid + "'");
itemObj.put("contractNum", projectCode);// ÏîÄ¿±àÂë
itemObj.put("bipOrderId", hvo.getVbillcode());// 饋簡땐데뵀
itemObj.put("entryName", projectName);// 淃커츰냔
itemObj.put("productQuantity", (int) item.getNastnum().doubleValue());// 鑒좆