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

rev: 盘点单生产日期修改

Browse Source
This commit is contained in:
liuxy
2023-05-19 17:54:49 +08:00
parent 2bcc3197cc
commit 1ca85950d9
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java
View File

@@ -731,12 +731,14 @@ public class CheckServiceImpl implements CheckService {
map.put("物料名称", jo.getString("material_name"));
if (ObjectUtil.isEmpty(jsonSub)) {
map.put("生产日期", "");
map.put("厚度", "");
map.put("幅宽", "");
map.put("标准厚度", "");
map.put("客户要求幅宽", "");
map.put("备注", "");
} else {
map.put("生产日期", jsonSub.getString("date_of_production"));
map.put("厚度", jsonSub.getString("thickness"));
map.put("幅宽", jsonSub.getString("width"));
map.put("标准厚度", jsonSub.getString("thickness_request"));

26
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql
View File

@@ -160,12 +160,23 @@
struct.sect_code,
mb.material_code,
mb.material_name,
user1.person_name AS process_optname
user1.person_name AS process_optname,
sub.date_of_production
FROM
ST_IVT_CheckDtl CheckDtl
LEFT JOIN md_me_materialbase mb ON mb.material_id = CheckDtl.material_id
LEFT JOIN st_ivt_structattr struct ON struct.struct_id = CheckDtl.struct_id
LEFT JOIN sys_user user1 ON user1.user_id = CheckDtl.process_optid
LEFT JOIN (
SELECT
MIN(date_of_production) AS date_of_production,
package_box_sn
FROM
pdm_bi_subpackagerelation
WHERE
1=1
group by package_box_sn
) sub ON sub.package_box_sn = CheckDtl.storagevehicle_code
WHERE
CheckDtl.status <> '1'
OPTION 输入.check_id <> ""
@@ -185,12 +196,23 @@
struct.sect_code,
mb.material_code,
mb.material_name,
user1.person_name AS process_optname
user1.person_name AS process_optname,
sub.date_of_production
FROM
ST_IVT_CheckDtl CheckDtl
LEFT JOIN md_me_materialbase mb ON mb.material_id = CheckDtl.material_id
LEFT JOIN st_ivt_structattr struct ON struct.struct_id = CheckDtl.struct_id
LEFT JOIN sys_user user1 ON user1.user_id = CheckDtl.process_optid
LEFT JOIN (
SELECT
MIN(date_of_production) AS date_of_production,
package_box_sn
FROM
pdm_bi_subpackagerelation
WHERE
1=1
group by package_box_sn
) sub ON sub.package_box_sn = CheckDtl.storagevehicle_code
WHERE
CheckDtl.status = '1'
OPTION 输入.check_id <> ""