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

rev；一期入库重量校验过滤

Browse Source
This commit is contained in:
liuxy
2024-08-29 09:39:59 +08:00
parent 589971386b
commit bf45dc5169
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
View File

@@ -662,6 +662,9 @@ public class ProductInstorServiceImpl implements ProductInstorService {
JSONObject data = jsonObject.getJSONArray("data").getJSONObject(0);
double weight_now = NumberUtil.div(data.getDoubleValue("weight"), 10);
if (data.getDoubleValue("weight") <= 0) {
throw new BadRequestException("当前称重重量有误，请检查！当前称重重量为【"+weight_now+"】");
}
// 获取系统参数1
double weight_sys = Double.parseDouble(SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("weight_sys").getValue());

19
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java
View File

@@ -464,7 +464,8 @@ public class StorPublicServiceImpl implements StorPublicService {
throw new BadRequestException("点位仓位更新未查询到符合条件的点位仓位！");
}
HashMap<String, String> map = new HashMap<>();
if ("1".equals(lock_type)) {//解锁
if ("1".equals(lock_type)) {
//解锁
map.put("lock_type", lock_type);
map.put("task_code", "");
map.put("inv_type", "");
@@ -488,10 +489,8 @@ public class StorPublicServiceImpl implements StorPublicService {
map.put("storagevehicle_code", storagevehicle_code);
}
}
wo_Struct.update(map, "struct_id = '" + jo.getString("struct_id") + "'");
wo_Point.update(map, "point_id = '" + jo.getString("point_id") + "'");
} else {//锁定
} else {
//锁定
map.put("lock_type", lock_type);
map.put("taskdtl_type", from.getString("task_type"));
map.put("taskdtl_id", from.getString("task_id"));
@@ -506,6 +505,7 @@ public class StorPublicServiceImpl implements StorPublicService {
map.put("point_status", "01");
}
}
// 更新点位仓位对应的字段属性
wo_Struct.update(map, "struct_id = '" + jo.getString("struct_id") + "'");
wo_Point.update(map, "point_id = '" + jo.getString("point_id") + "'");
}
@@ -539,16 +539,16 @@ public class StorPublicServiceImpl implements StorPublicService {
throw new BadRequestException("点位仓位更新未查询到符合条件的点位仓位！");
}
HashMap<String, String> map = new HashMap<>();
if ("1".equals(lock_type)) {//解锁
if ("1".equals(lock_type)) {
//解锁
map.put("lock_type", lock_type);
map.put("task_code", "");
map.put("inv_type", "");
map.put("inv_id", "");
map.put("inv_code", "");
map.put("point_status", "1");
wo_Struct.update(map, "struct_id = '" + jo.getString("struct_id") + "'");
wo_Point.update(map, "point_id = '" + jo.getString("point_id") + "'");
} else {//锁定
} else {
//锁定
map.put("lock_type", lock_type);
map.put("taskdtl_type", from.getString("task_type"));
map.put("taskdtl_id", from.getString("task_id"));
@@ -563,6 +563,7 @@ public class StorPublicServiceImpl implements StorPublicService {
map.put("point_status", "01");
}
}
// 更新点位仓位对应的字段属性
wo_Struct.update(map, "struct_id = '" + jo.getString("struct_id") + "'");
wo_Point.update(map, "point_id = '" + jo.getString("point_id") + "'");
}