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-12-10 16:42:28 +08:00
parent 29d99f2ecc 7d26ffeb84
commit c80db57368
10 changed files with 121 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -82,6 +82,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
if (StrUtil.isNotEmpty(map.get("vbeln"))) {
map.put("vbeln", "%" + map.get("vbeln") + "%");
}
if (StrUtil.isNotEmpty(map.get("pcsn"))) {
map.put("pcsn", "%" + map.get("pcsn") + "%");
}
if (StrUtil.isNotEmpty(map.get("sap_pcsn"))) {
map.put("sap_pcsn", "%" + map.get("sap_pcsn") + "%");
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();

10
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
View File

@@ -82,6 +82,8 @@
ST_IVT_IOStorInv ios
LEFT JOIN md_cs_customerbase cu ON ios.cust_code = cu.cust_code
LEFT JOIN st_ivt_iostorinvdtl dtl ON ios.iostorinv_id = dtl.iostorinv_id
LEFT JOIN st_ivt_iostorinvdis dis ON ios.iostorinv_id = dis.iostorinv_id
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
WHERE
ios.io_type = '1'
and ios.is_delete='0'
@@ -91,6 +93,14 @@
ios.bill_code like 输入.bill_code
ENDOPTION
OPTION 输入.sap_pcsn <> ""
sub.sap_pcsn like 输入.sap_pcsn
ENDOPTION
OPTION 输入.pcsn <> ""
dis.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.io_type <> ""
ios.io_type = 输入.io_type
ENDOPTION

4
lms/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java
View File

@@ -39,6 +39,8 @@ public class IostordailyServiceImpl implements IostordailyService {
String material_code = MapUtil.getStr(whereJson, "material_code");
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String pcsn = MapUtil.getStr(whereJson, "pcsn");
String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn");
String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn");
//物料限制的时候使用，初始化页面
String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
HashMap<String, String> map = new HashMap<>(whereJson);
@@ -59,6 +61,8 @@ public class IostordailyServiceImpl implements IostordailyService {
map.put("material_code", "%" + material_code + "%");
}
if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", "%" + pcsn + "%");
if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn", "%" + sap_pcsn + "%");
if (ObjectUtil.isNotEmpty(package_box_sn)) map.put("package_box_sn", "%" + package_box_sn + "%");
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();

18
lms/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery.wql
View File

@@ -20,6 +20,8 @@
输入.material_code TYPEAS s_string
输入.classIds TYPEAS f_string
输入.pcsn TYPEAS s_string
输入.sap_pcsn TYPEAS s_string
输入.package_box_sn TYPEAS s_string
输入.in_stor_id TYPEAS f_string
@@ -64,7 +66,9 @@
da.out_num,
da.end_num,
da.more_num,
da.less_num
da.less_num,
sub.sap_pcsn,
sub.package_box_sn
FROM(
SELECT
sum(start_num) AS start_num,
@@ -90,6 +94,7 @@
LEFT JOIN md_pb_classstandard class ON mater.material_type_id = class.class_id
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mater.base_unit_id
LEFT JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = da.stor_id
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = da.pcsn
WHERE 1=1
and stor.stor_id in 输入.in_stor_id
@@ -111,8 +116,15 @@
ENDOPTION
OPTION 输入.pcsn <> ""
(da.pcsn like 输入.pcsn or
da.pcsn like 输入.pcsn)
da.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.sap_pcsn <> ""
sub.sap_pcsn like 输入.sap_pcsn
ENDOPTION
OPTION 输入.package_box_sn <> ""
sub.package_box_sn like 输入.package_box_sn
ENDOPTION
OPTION 输入.classIds <> ""