Merge remote-tracking branch 'origin/main'

This commit is contained in:
mzr 2025-04-12 10:21:56 +08:00
commit e8a05d8fc5
2 changed files with 3 additions and 32 deletions

View File

@ -75,8 +75,7 @@ public class saleUpdateSQty extends AbstractNCCRestResource {
List sqlStr = new ArrayList();
for (int i = 0; i < arrayList.size(); i++) {
Map dataMap = (Map) arrayList.get(i);
String csaleorderid = getSaleorderBPK(pk_org, (String) dataMap.get("vbillcode"),
(String) dataMap.get("crowno"));
String csaleorderid = (String) dataMap.get("crowno");
if (csaleorderid != null) {
sqlStr.add(
"UPDATE so_saleorder_b SET vbdef2 = '" + dataMap.get("sendQty") + "' WHERE csaleorderbid='"
@ -225,34 +224,6 @@ public class saleUpdateSQty extends AbstractNCCRestResource {
}
/*
*创建时间2024-11-28
*作用查询
*传值
*返回值必填项map对象
*/
private String getSaleorderBPK(String pk_org, String vbillcode, String crowno) throws BusinessException {
String sql = " select b.csaleorderbid from so_saleorder h \n"
+ " left join so_saleorder_b b on h.csaleorderid=b.csaleorderid\n"
+ " left join org_salesorg o on h.pk_org=o.pk_salesorg\n"
+ " where h.dr=0 and b.dr=0 and\n"
+ " h.vbillcode='" + vbillcode + "' and o.code='" + pk_org + "' and b.crowno='" + crowno + "' ";
String saleorderBPK = (String) getQueryService().executeQuery(sql, new ColumnProcessor());
return saleorderBPK;
}
/*
*创建时间2024-11-28
*作用查询
*传值
*返回值必填项map对象
*/
private int updateSaleBSQty(String sql) throws BusinessException {
BaseDAO baseDAO = new BaseDAO();
int succInt = baseDAO.executeUpdate(sql);
return succInt;
}
public IUAPQueryBS getQueryService() {
return NCLocator.getInstance().lookup(IUAPQueryBS.class);
}

View File

@ -81,7 +81,7 @@ public class saleUpdateLJpc extends AbstractNCCRestResource {
+ "LEFT JOIN org_salesorg o ON h.pk_org = o.pk_salesorg "
+ "WHERE b.dr=0 and h.vbillcode = '" + dataMap.get("vbillcode") + "' "
+ "AND o.code = '" + pk_org + "' "
+ "AND b.crowno = '" + dataMap.get("crowno") + "'";
+ "AND b.csaleorderbid = '" + dataMap.get("crowno") + "'";
List<Map<String, Object>> results = (List<Map<String, Object>>) getQueryService().executeQuery(sqlser, new MapListProcessor());
if (results.size()==0){
returnJson.put("state", 'N');
@ -97,7 +97,7 @@ public class saleUpdateLJpc extends AbstractNCCRestResource {
+ " LEFT JOIN org_salesorg o ON h.pk_org = o.pk_salesorg"
+ " WHERE h.vbillcode = '" + dataMap.get("vbillcode") + "' "
+ " AND o.code = '" + pk_org + "' "
+ " AND b.crowno = '" + dataMap.get("crowno") + "' and b.dr=0 "
+ " AND b.csaleorderbid = '" + dataMap.get("crowno") + "' and b.dr=0 "
+ ");");
}
}