Merge remote-tracking branch 'origin/main'
This commit is contained in:
		
						commit
						bac9acf5e3
					
				|  | @ -11,7 +11,6 @@ import nc.jdbc.framework.PersistenceManager; | |||
| import nc.jdbc.framework.exception.DbException; | ||||
| import nc.jdbc.framework.processor.ColumnProcessor; | ||||
| import nc.jdbc.framework.processor.MapListProcessor; | ||||
| import nc.jdbc.framework.processor.MapProcessor; | ||||
| import nc.vo.pub.BusinessException; | ||||
| import nccloud.api.rest.utils.ResultMessageUtil; | ||||
| import nccloud.commons.lang.StringUtils; | ||||
|  | @ -108,20 +107,18 @@ public class saleUpdateLJpc extends AbstractNCCRestResource { | |||
|                             + "      AND b.csaleorderbid = '" + dataMap.get("crowno") + "' and b.dr=0  " | ||||
|                             + ");"); | ||||
|                 } | ||||
|                 JSONObject resJson = new JSONObject(dataMap); | ||||
|                 String csaleorderbid = dataMap.getOrDefault("csaleorderbid", "") + ""; | ||||
|                 if (StringUtils.isNotEmpty(csaleorderbid)) { | ||||
|                     String sql = " select sb.csaleorderbid,sb.vbdef19,sb.vbdef20" + | ||||
|                             " from so_saleorder_b sb" + | ||||
|                             " where sb.csaleorderbid='" + csaleorderbid + "' "; | ||||
|                     Map<String, Object> soMap = (Map<String, Object>) getQueryService().executeQuery(sql, new MapProcessor()); | ||||
|                     resJson.put("vbdef19", soMap.getOrDefault("vbdef19", "")); | ||||
|                     resJson.put("vbdef20", soMap.getOrDefault("vbdef20", "")); | ||||
|                     String updateSql = "UPDATE so_saleorder_b " | ||||
|                             + " SET vbdef19 = '[vbdef19]', vbdef20 = '[vbdef20]'" | ||||
|                             + " WHERE csaleorderid = '" + csaleorderbid + "';"; | ||||
|                     updateSql = updateSql.replace("[vbdef19]", dataMap.getOrDefault("vbdef19", "") + ""); | ||||
|                     updateSql = updateSql.replace("[vbdef20]", dataMap.getOrDefault("vbdef20", "") + ""); | ||||
|                     sqlStr.add(updateSql); | ||||
|                 } | ||||
|                 resList.add(resJson); | ||||
| 
 | ||||
|             } | ||||
| 
 | ||||
| //            int succState = updateSaleBSQty(sqlStr.toString()); | ||||
|             int succState = executeUpdate(sqlStr); | ||||
| 
 | ||||
|             if (succState == arrayList.size()) { | ||||
|  | @ -132,7 +129,6 @@ public class saleUpdateLJpc extends AbstractNCCRestResource { | |||
|                 returnJson.put("state", 'N'); | ||||
|                 returnJson.put("msg", "ʧ°Ü,ÒÑÐÞ¸Ä" + succState + "ÐÐ"); | ||||
|             } | ||||
|             returnJson.put("resList", resList); | ||||
|             return ResultMessageUtil.toJSON(returnJson); | ||||
|         } catch (Exception e) { | ||||
|             throw new RuntimeException(e); | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue