root/wuHanXinRui
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-07-14 09:57:12 +08:00
parent 254a14736b
commit b9a180dabf
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPDM_WORK_TASK.wql
View File

@@ -140,6 +140,7 @@
wt.workprocedure_name, wt.workprocedure_name,
device.device_code, device.device_code,
device.device_id, device.device_id,
producmaterialext.standard_weight,
wt.workprocedure_id AS workprocedure_uuid, wt.workprocedure_id AS workprocedure_uuid,
device.device_name, device.device_name,
( (
@@ -159,6 +160,7 @@
LEFT JOIN md_me_materialbase mb ON mb.material_id = wt.material_id LEFT JOIN md_me_materialbase mb ON mb.material_id = wt.material_id
LEFT JOIN em_bi_deviceinfo device ON device.device_id = wt.device_id LEFT JOIN em_bi_deviceinfo device ON device.device_id = wt.device_id
LEFT JOIN pdm_bi_workorder wo ON wo.workorder_id = wt.workorder_id LEFT JOIN pdm_bi_workorder wo ON wo.workorder_id = wt.workorder_id
LEFT JOIN md_me_producmaterialext producmaterialext ON producmaterialext.material_id = wt.material_id
WHERE WHERE
wt.workorder_id = 输入.workorder_id wt.workorder_id = 输入.workorder_id
AND AND

6
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/EndProductServiceImpl.java
View File

@@ -138,8 +138,8 @@ public class EndProductServiceImpl implements EndProductService {
} }
//假如没记录就插入 //假如没记录就插入
JSONObject bucketObj = new JSONObject();
if (ObjectUtil.isEmpty(bucketJo)) { if (ObjectUtil.isEmpty(bucketJo)) {
JSONObject bucketObj = new JSONObject();
bucketObj.put("bucket_record_id", IdUtil.getSnowflake(1, 1).nextId()); bucketObj.put("bucket_record_id", IdUtil.getSnowflake(1, 1).nextId());
if (StrUtil.isEmpty(bucketunique)) { if (StrUtil.isEmpty(bucketunique)) {
bucketunique = CodeUtil.getNewCode("PRODUCT_BUCKET_CODE"); bucketunique = CodeUtil.getNewCode("PRODUCT_BUCKET_CODE");
@@ -202,7 +202,7 @@ public class EndProductServiceImpl implements EndProductService {
offlinejo.put("material_id", material_id); offlinejo.put("material_id", material_id);
offlinejo.put("pcsn", pcsn); offlinejo.put("pcsn", pcsn);
offlinejo.put("bucketunique", bucketunique); offlinejo.put("bucketunique", bucketunique);
offlinejo.put("ordernum", changeObj.getString("record_order")); offlinejo.put("ordernum", bucketObj.getString("record_order"));
offlinejo.put("qty", result_qty); offlinejo.put("qty", result_qty);
offlinejo.put("qty_unit_id", materDto.getBase_unit_id()); offlinejo.put("qty_unit_id", materDto.getBase_unit_id());
offlinejo.put("qty_unit_name", materDto.getBase_unit_name()); offlinejo.put("qty_unit_name", materDto.getBase_unit_name());
@@ -219,7 +219,7 @@ public class EndProductServiceImpl implements EndProductService {
map.put("material_id", material_id); map.put("material_id", material_id);
map.put("pcsn", pcsn); map.put("pcsn", pcsn);
map.put("bucketunique", bucketunique); map.put("bucketunique", bucketunique);
map.put("ordernum", changeObj.getString("record_order")); map.put("ordernum", bucketObj.getString("record_order"));
map.put("qty", result_qty+""); map.put("qty", result_qty+"");
map.put("qty_unit_id", materDto.getBase_unit_id()+""); map.put("qty_unit_id", materDto.getBase_unit_id()+"");
map.put("qty_unit_name", materDto.getBase_unit_name()); map.put("qty_unit_name", materDto.getBase_unit_name());

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql
View File

@@ -48,7 +48,7 @@
class.class_code, class.class_code,
class.class_name, class.class_name,
unit_name, unit_name,
'50' as standard_weight, producmaterialext.standard_weight,
unit_name as base_unit_id_name, unit_name as base_unit_id_name,
producmaterialext.product_series producmaterialext.product_series
FROM FROM