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

Merge branch 'master' of 121.40.234.130:root/lanzhouhailiang_one

Browse Source
This commit is contained in:
yanps
2024-01-04 09:37:30 +08:00
parent f69d754c9c 13d3d648f7
commit 4d4f35bd21
3 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,7 @@
FROM
ST_IVT_IOStorInv ios
LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinv_id = ios.iostorinv_id
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn
WHERE
ios.is_delete = '0'
AND

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

@@ -792,7 +792,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
JSONArray resultJSONArray = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).process().getResultJSONArray(0);
List<JSONObject> ivtList = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "20").process().getResultJSONArray(0).toJavaList(JSONObject.class);
List<JSONObject> ivtList = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "21").process().getResultJSONArray(0).toJavaList(JSONObject.class);
List<Map<String, Object>> list = new ArrayList<>();
@@ -822,7 +822,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
}
String box_weight = ivtList.stream()
.filter(row -> row.getString("bill_code").equals(jsonObject.getString("bill_code")))
.filter(row -> row.getString("iostorinvdtl_id").equals(jsonObject.getString("iostorinvdtl_id")))
.map(row -> row.getDoubleValue("box_weight"))
.reduce(Double::sum).orElse(0.00).toString();

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

@@ -199,7 +199,8 @@
MAX(ios.order_number) AS order_number,
MAX(ios.receiptaddress) AS receiptaddress,
MAX( sd.label ) AS bill_status,
count(DISTINCT(dis.box_no)) as box_count
count(DISTINCT(dis.box_no)) as box_count,
dtl.iostorinvdtl_id
FROM
st_ivt_iostorinvdis dis
LEFT JOIN st_ivt_iostorinvdtl dtl ON dis.iostorinvdtl_id = dtl.iostorinvdtl_id
@@ -1105,32 +1106,21 @@
ENDQUERY
ENDIF
IF 输入.flag = "20"
IF 输入.flag = "21"
QUERY
SELECT
SUM(sub.box_weight) AS box_weight,
MAX(ios.bill_code) AS bill_code
MAX(dtl.iostorinvdtl_id) AS iostorinvdtl_id
FROM
(
SELECT
a.box_no,
MAX(b.iostorinv_id) AS iostorinv_id,
MAX(a.pcsn) AS pcsn
FROM
st_ivt_iostorinvdis a
LEFT JOIN st_ivt_iostorinv b ON a.iostorinv_id = b.iostorinv_id
WHERE
b.io_type = '1'
and b.is_delete='0'
GROUP BY a.box_no
) dis
LEFT JOIN st_ivt_iostorinv ios ON dis.iostorinv_id = ios.iostorinv_id
st_ivt_iostorinvdis dis
LEFT JOIN st_ivt_iostorinvdtl dtl ON dis.iostorinvdtl_id = dtl.iostorinvdtl_id
LEFT JOIN st_ivt_iostorinv ios ON ios.iostorinv_id = dtl.iostorinv_id
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = dis.box_no AND dis.pcsn = sub.container_name
WHERE
ios.io_type = '1'
and ios.is_delete='0'
GROUP BY ios.bill_code
GROUP BY dtl.iostorinvdtl_id
ENDSELECT
ENDQUERY