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

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
liyongde
2024-07-09 23:15:34 +08:00
parent c8004cf002 1105f0dd28
commit 8287c2d0c2
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
View File

@@ -139,7 +139,7 @@ public class LashManageServiceImpl implements LashManageService {
jsonPoint.put("vehicle_qty", NumberUtil.add(jsonPoint.getBigDecimal("vehicle_qty"), 1)); jsonPoint.put("vehicle_qty", NumberUtil.add(jsonPoint.getBigDecimal("vehicle_qty"), 1));
if (jsonPoint.getIntValue("vehicle_qty") == Integer.parseInt(boxTypeDao.getLash_num_tow())) { if (jsonPoint.getIntValue("vehicle_qty") == Integer.parseInt(boxTypeDao.getLash_num())) {
// 相同清空载具以及数量 // 相同清空载具以及数量
jsonPoint.put("vehicle_qty", 0); jsonPoint.put("vehicle_qty", 0);
jsonPoint.put("vehicle_code", ""); jsonPoint.put("vehicle_code", "");

3
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java
View File

@@ -197,6 +197,9 @@ public class CallEmpReelTask extends AbstractAcsTask {
cache_param.put("point_location", jsonIvt.getString("point_location")); cache_param.put("point_location", jsonIvt.getString("point_location"));
cache_param.put("product_area", jsonIvt.getString("product_area")); cache_param.put("product_area", jsonIvt.getString("product_area"));
JSONObject cache_jo = WQL.getWO("PDA_COOLIN").addParamMap(cache_param).process().uniqueResult(0); JSONObject cache_jo = WQL.getWO("PDA_COOLIN").addParamMap(cache_param).process().uniqueResult(0);
if(ObjectUtil.isEmpty(cache_jo)) {
throw new BadRequestException("未查询到可用的冷却区暂存位！");
}
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("point_code1", point_code4); param.put("point_code1", point_code4);
param.put("point_code2", cache_jo.getString("point_code")); param.put("point_code2", cache_jo.getString("point_code"));