root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:处理代码冲突

Browse Source
This commit is contained in:
baoge
2024-05-10 14:19:13 +08:00
parent ce168c147b
commit a07df96854
31 changed files with 172 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/AutoRiKuServiceImpl.java
View File

@@ -209,15 +209,15 @@ public class AutoRiKuServiceImpl implements AutoRiKuService {
@Override
public JSONObject queryNum(JSONObject whereJson) {
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point");
String layer_num = whereJson.getString("layer_num");
// 有货个数
JSONArray haveMoney = pointTab.query("layer_num = '" + layer_num + "' and point_type = '9' and IFNULL(vehicle_code,'')<>'' and is_delete = '0' and is_used = '1'").getResultJSONArray(0);
JSONArray haveMoney = schBasePointService.query("layer_num = '" + layer_num + "' and point_type = '9' and IFNULL(vehicle_code,'')<>'' and is_delete = '0' and is_used = '1'").getResultJSONArray(0);
// 无货个数
JSONArray unMoney = pointTab.query("layer_num = '" + layer_num + "' and point_type = '9' and IFNULL(vehicle_code,'')='' and is_delete = '0' and is_used = '1'").getResultJSONArray(0);
JSONArray unMoney = schBasePointService.query("layer_num = '" + layer_num + "' and point_type = '9' and IFNULL(vehicle_code,'')='' and is_delete = '0' and is_used = '1'").getResultJSONArray(0);
JSONObject result = new JSONObject();
result.put("haveMoney", haveMoney.size());