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

fix:载具托盘解绑、退货入库回传

Browse Source
This commit is contained in:
zhouz
2026-06-22 16:35:35 +08:00
parent 1bfcd783b6
commit 514a42102b
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java
View File

@@ -129,10 +129,10 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
code = "VEHICLE_CODE_GXTP"; code = "VEHICLE_CODE_GXTP";
break; break;
case "0003": case "0003":
if (class_jo.getString("class_code").equals("000301")){ if (class_jo.getString("class_code").equals("000301")) {
code = "VEHICLE_CODE_LK"; code = "VEHICLE_CODE_LK";
} }
if (class_jo.getString("class_code").equals("000302")){ if (class_jo.getString("class_code").equals("000302")) {
code = "VEHICLE_CODE_LKB"; code = "VEHICLE_CODE_LKB";
} }
break; break;
@@ -179,7 +179,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
String qty = dto.getString("qty"); String qty = dto.getString("qty");
String pcsn = dto.getString("pcsn"); String pcsn = dto.getString("pcsn");
if (StrUtil.isNotEmpty(qty) || StrUtil.isNotEmpty(pcsn)) { if (StrUtil.isNotEmpty(qty) || StrUtil.isNotEmpty(pcsn)) {
JSONObject ext_jo = veExtTab.query("storagevehicle_code = '"+dto.getString("storagevehicle_code")+"'").uniqueResult(0); JSONObject ext_jo = veExtTab.query("storagevehicle_code = '" + dto.getString("storagevehicle_code") + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(ext_jo)) { if (ObjectUtil.isEmpty(ext_jo)) {
//新增一条记录 //新增一条记录
JSONObject jsonVeExt = new JSONObject(); JSONObject jsonVeExt = new JSONObject();
@@ -197,9 +197,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
jsonVeExt.put("update_time", DateUtil.now()); jsonVeExt.put("update_time", DateUtil.now());
veExtTab.insert(jsonVeExt); veExtTab.insert(jsonVeExt);
} else { } else {
if (StrUtil.isNotEmpty(pcsn)) { ext_jo.put("pcsn", pcsn);
ext_jo.put("pcsn", pcsn);
}
if (StrUtil.isNotEmpty(qty)) { if (StrUtil.isNotEmpty(qty)) {
ext_jo.put("qty", qty); ext_jo.put("qty", qty);
} }

7
lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
View File

@@ -1131,7 +1131,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
} }
//退货入库 //退货入库
if (StrUtil.equals(bill_type, "0002")) { if (StrUtil.equals(bill_type, "0002") || StrUtil.equals(bill_type, "0013") || StrUtil.equals(bill_type, "0014")) {
// 1.回传sap // 1.回传sap
JSONArray paramSapMstArr = new JSONArray(); JSONArray paramSapMstArr = new JSONArray();
@@ -1162,10 +1162,11 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0); JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonSect)) { if (ObjectUtil.isNotEmpty(jsonSect)) {
// jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点 // jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点
jsonDtl.put("LGORT", jo_mst.getString("remark")); // 明細储存地点 //jsonDtl.put("LGORT", jo_mst.getString("remark")); // 明細储存地点
jsonDtl.put("LGORT", lgort);
} }
JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '" + json2.getString("box_no") + "' AND bill_id = '" + json2.getString("iostorinv_id") + "'").uniqueResult(0); JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_bo x_sn = '" + json2.getString("box_no") + "' AND bill_id = '" + json2.getString("iostorinv_id") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonSect)) { if (ObjectUtil.isNotEmpty(jsonSect)) {
jsonDis.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次 jsonDis.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次
} }