Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
e8a05d8fc5
|
@ -75,8 +75,7 @@ public class saleUpdateSQty extends AbstractNCCRestResource {
|
||||||
List sqlStr = new ArrayList();
|
List sqlStr = new ArrayList();
|
||||||
for (int i = 0; i < arrayList.size(); i++) {
|
for (int i = 0; i < arrayList.size(); i++) {
|
||||||
Map dataMap = (Map) arrayList.get(i);
|
Map dataMap = (Map) arrayList.get(i);
|
||||||
String csaleorderid = getSaleorderBPK(pk_org, (String) dataMap.get("vbillcode"),
|
String csaleorderid = (String) dataMap.get("crowno");
|
||||||
(String) dataMap.get("crowno"));
|
|
||||||
if (csaleorderid != null) {
|
if (csaleorderid != null) {
|
||||||
sqlStr.add(
|
sqlStr.add(
|
||||||
"UPDATE so_saleorder_b SET vbdef2 = '" + dataMap.get("sendQty") + "' WHERE csaleorderbid='"
|
"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() {
|
public IUAPQueryBS getQueryService() {
|
||||||
return NCLocator.getInstance().lookup(IUAPQueryBS.class);
|
return NCLocator.getInstance().lookup(IUAPQueryBS.class);
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,7 +81,7 @@ public class saleUpdateLJpc extends AbstractNCCRestResource {
|
||||||
+ "LEFT JOIN org_salesorg o ON h.pk_org = o.pk_salesorg "
|
+ "LEFT JOIN org_salesorg o ON h.pk_org = o.pk_salesorg "
|
||||||
+ "WHERE b.dr=0 and h.vbillcode = '" + dataMap.get("vbillcode") + "' "
|
+ "WHERE b.dr=0 and h.vbillcode = '" + dataMap.get("vbillcode") + "' "
|
||||||
+ "AND o.code = '" + pk_org + "' "
|
+ "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());
|
List<Map<String, Object>> results = (List<Map<String, Object>>) getQueryService().executeQuery(sqlser, new MapListProcessor());
|
||||||
if (results.size()==0){
|
if (results.size()==0){
|
||||||
returnJson.put("state", 'N');
|
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"
|
+ " LEFT JOIN org_salesorg o ON h.pk_org = o.pk_salesorg"
|
||||||
+ " WHERE h.vbillcode = '" + dataMap.get("vbillcode") + "' "
|
+ " WHERE h.vbillcode = '" + dataMap.get("vbillcode") + "' "
|
||||||
+ " AND o.code = '" + pk_org + "' "
|
+ " 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 "
|
||||||
+ ");");
|
+ ");");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue