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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2024-01-11 15:42:24 +08:00
parent 54fe5a6e84 9cd78f0d25
commit 38628e518c
19 changed files with 253 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AUTOQUERYBILLINFO.wql
View File

@@ -66,7 +66,7 @@
LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id
LEFT JOIN pdm_bi_subpackagerelation sub ON ivt.pcsn = sub.container_name
WHERE
DATEDIFF( NOW(), sub.date_of_production ) >= SUBSTRING_INDEX(sub.quality_guaran_period,'天',1)
DATEDIFF( NOW(), sub.date_of_production ) > SUBSTRING_INDEX(sub.quality_guaran_period,'天',1)
AND ivt.canuse_qty > '0'
GROUP BY attr.stor_id
@@ -107,7 +107,7 @@
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = attr.storagevehicle_code
AND ivt.pcsn = sub.container_name
WHERE
DATEDIFF( NOW(), sub.date_of_production ) < '90'
DATEDIFF( NOW(), sub.date_of_production ) <= '90'
AND ivt.canuse_qty > '0'
GROUP BY attr.stor_id

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

@@ -336,8 +336,16 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
.map(row -> row.getString("box_no"))
.collect(Collectors.joining("','"));
// 所有子卷
List<JSONObject> disList = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("box_no in ('" + box_no_in + "') and iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0).toJavaList(JSONObject.class);
// 所有分切计划
// String pcsn_in = disList.stream()
// .map(row -> row.getString("pcsn"))
// .collect(Collectors.joining("','"));
// List<JSONObject> planList = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name in ('" + pcsn_in + "')").getResultJSONArray(0).toJavaList(JSONObject.class);
JSONObject param = new JSONObject();
JSONArray item = new JSONArray();
@@ -359,7 +367,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("ContainerName", jsonObject.getString("pcsn"));
jsonObject1.put("NetWeight", jsonObject.getString("plan_qty"));
jsonObject1.put("NetWeight",NumberUtil.toStr(jsonObject.getDoubleValue("plan_qty")));
details.add(jsonObject1);
}
jsonDtl.put("Details", details);
@@ -1552,7 +1560,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("ContainerName", jsonObject.getString("pcsn"));
jsonObject1.put("NetWeight", jsonObject.getString("plan_qty"));
jsonObject1.put("NetWeight", NumberUtil.toStr(jsonObject.getDoubleValue("plan_qty")));
details.add(jsonObject1);
}
jsonDtl.put("Details", details);