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

更新

Browse Source
This commit is contained in:
zhangjiangwei
2023-03-22 08:41:42 +08:00
parent 2acfa85a68
commit 1b26f269e3
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -339,6 +339,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isNotEmpty(jsonObject.get("vehicle_code")) && !StrUtil.equals(jsonObject.get("vehicle_code").toString(), "0000") && !"0".equals(jsonObject.get("vehicle_code").toString())) { if (ObjectUtil.isNotEmpty(jsonObject.get("vehicle_code")) && !StrUtil.equals(jsonObject.get("vehicle_code").toString(), "0000") && !"0".equals(jsonObject.get("vehicle_code").toString())) {
vehicle_code = jsonObject.get("vehicle_code").toString(); vehicle_code = jsonObject.get("vehicle_code").toString();
} }
if (device_code.startsWith("FJJXSXLW") && StrUtil.isNotBlank(vehicle_code)) {
WQLObject.getWQLObject("st_buss_vehiclegroup").delete("vehicle_code = '" + vehicle_code + "'");
}
String qty = String.valueOf(jsonObject.get("qty")); String qty = String.valueOf(jsonObject.get("qty"));
//产品编码 //产品编码
String product_code = String.valueOf(jsonObject.get("product_code")); String product_code = String.valueOf(jsonObject.get("product_code"));
@@ -442,6 +445,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
jsonObject.put("type", "1"); jsonObject.put("type", "1");
jsonObject.put("group_id", group_id); jsonObject.put("group_id", group_id);
jsonObject.put("producetask_id", producetask_id); jsonObject.put("producetask_id", producetask_id);
jsonObject.put("material_code", materialObj.getString("material_code"));
this.receiveTaskFromAcs(jsonObject); this.receiveTaskFromAcs(jsonObject);
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("status", HttpStatus.OK.value()); result.put("status", HttpStatus.OK.value());

6
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/KilnServiceImpl.java
View File

@@ -78,11 +78,11 @@ public class KilnServiceImpl implements KilnService {
// 删除仓位库存 // 删除仓位库存
if (ObjectUtil.isNotEmpty(struct_id)) structIvtTab.delete("struct_id = '" + struct_id + "'"); if (ObjectUtil.isNotEmpty(struct_id)) structIvtTab.delete("struct_id = '" + struct_id + "'");
// 组盘不为空则删除组盘信息以及设置载具编码为空 // 组盘不为空则删除组盘信息以及设置载具编码为空
if (ObjectUtil.isNotEmpty(vehicleGroupObj)) vehicleGroupTab.delete(vehicleGroupObj); // if (ObjectUtil.isNotEmpty(vehicleGroupObj)) vehicleGroupTab.delete(vehicleGroupObj);
vehicle_code = null; vehicle_code = null;
} else if (point_status.equals("01")) { // 空载具 } else if (point_status.equals("01")) { // 空载具
// 删除组盘 // 删除组盘
if (ObjectUtil.isNotEmpty(vehicleGroupObj)) vehicleGroupTab.delete(vehicleGroupObj); if (ObjectUtil.isNotEmpty(vehicle_code)) vehicleGroupTab.delete("vehicle_code = '" + vehicle_code + "'");
// 删除仓位库存 // 删除仓位库存
if (ObjectUtil.isNotEmpty(struct_id)) structIvtTab.delete("struct_id = '" + struct_id + "'"); if (ObjectUtil.isNotEmpty(struct_id)) structIvtTab.delete("struct_id = '" + struct_id + "'");
} else { // 有箱有料 } else { // 有箱有料
@@ -141,7 +141,7 @@ public class KilnServiceImpl implements KilnService {
} }
// 组盘表 // 组盘表
// 存在相应载具的话删掉在存 // 存在相应载具的话删掉在存
if (ObjectUtil.isNotEmpty(vehicleGroupObj)) vehicleGroupTab.delete(vehicleGroupObj); if (ObjectUtil.isNotEmpty(vehicle_code)) vehicleGroupTab.delete("vehicle_code = '" + vehicle_code + "'");
JSONObject vehicleGroup = new JSONObject(); JSONObject vehicleGroup = new JSONObject();
vehicleGroup.put("group_id", IdUtil.getSnowflake(1, 1).nextId()); vehicleGroup.put("group_id", IdUtil.getSnowflake(1, 1).nextId());
vehicleGroup.put("vehicle_code", vehicle_code); vehicleGroup.put("vehicle_code", vehicle_code);