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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-10-26 14:40:23 +08:00
parent 6b1b24f9ea
commit da4bac7e32
4 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls
View File

Binary file not shown.

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

@@ -574,9 +574,9 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
HashMap<String, String> map = rows.get(0);
//判断该载具是否已经分配货位或者起点
JSONArray now_dis_rows = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("storagevehicle_code = '" + map.get("storagevehicle_code") + "' AND work_status < '99' AND (struct_id <> '' AND struct_id is not null)").getResultJSONArray(0);
JSONArray now_dis_rows = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("box_no = '" + map.get("box_no") + "' AND work_status < '99' AND (struct_id <> '' AND struct_id is not null)").getResultJSONArray(0);
if (now_dis_rows.size() > 0) {
throw new BadRequestException("该载具已经分配过货位，无法继续分配！");
throw new BadRequestException("该木箱已经分配过货位，无法继续分配！");
}
String point_code = map.get("point_code");

3
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
View File

@@ -24,6 +24,7 @@
输入.bill_type TYPEAS s_string
输入.container_name TYPEAS s_string
输入.package_box_sn TYPEAS s_string
输入.iostorinv_id TYPEAS s_string
[临时表]
@@ -153,7 +154,7 @@
SELECT
dis.*,
mb.material_code,
mb.material_name,
mb.material_name
FROM
st_ivt_iostorinvdis dis
INNER JOIN md_me_materialbase mb ON mb.material_id = dis.material_id