root/wuHanXinRui
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/wuHanXinRui

Browse Source
This commit is contained in:
zds
2022-07-18 10:35:22 +08:00
parent 8acc6d31f8 e045d2b2ec
commit 4c5acd6be0
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
View File

@@ -264,7 +264,7 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
throw new PdaRequestException("当前工令工序任务状态不为检查确认！");
}
if(StrUtil.isEmpty(device_code)){
if (StrUtil.isEmpty(device_code)) {
throw new PdaRequestException("设备不能为空！");
}
JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '" + device_code + "'").uniqueResult(0);
@@ -301,8 +301,8 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
if (!work_task.getString("workprocedure_code").equals("GX003")) {
//判断该设备是否存在未完成的工序任务
JSONObject device_task = WQLObject.getWQLObject("PDM_BI_WorkTask").query("device_id = '"+device.getString("device_id")+"' AND status = '30'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(device_task)){
JSONObject device_task = WQLObject.getWQLObject("PDM_BI_WorkTask").query("device_id = '" + device.getString("device_id") + "' AND status = '30'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(device_task)) {
throw new PdaRequestException("该设备已经存在生产中的工序任务！");
}
}
@@ -1335,6 +1335,7 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
double put_qty = dtl_jo.getDoubleValue("put_qty");
double need_qty = NumberUtil.sub(formula_qty, put_qty);
double storage_qty = bucket_jo.getDoubleValue("storage_qty");
double standard_weight = bucket_jo.getDoubleValue("standard_weight");
if (storage_qty == 0) {
throw new PdaRequestException("桶重量为0！");
}
@@ -1359,7 +1360,7 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
if ((dtl_jo.getString("material_type").equals("01") && bucket_jo.getString("material_id").equals(dtl_jo.getString("material_id")))
|| (dtl_jo.getString("material_type").equals("02") && is_child)) {
JSONObject min_bucket = WQLObject.getWQLObject("md_pb_bucketrecord").query("material_id = '" + bucket_jo.getString("material_id") + "' AND storagevehicle_code = '" + bucket_jo.getString("vehicle_code") + "' order by storage_qty asc").uniqueResult(0);
if (ObjectUtil.isNotEmpty(min_bucket) && min_bucket.getDoubleValue("storage_qty") < bucket_jo.getDoubleValue("storage_qty")) {
if (ObjectUtil.isNotEmpty(min_bucket) && min_bucket.getDoubleValue("storage_qty") < bucket_jo.getDoubleValue("storage_qty") && need_qty < standard_weight) {
desc = "桶错误！请选择重量更小的桶！";
flag = "4";
} else {

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

@@ -383,11 +383,13 @@
sa.struct_code,
sa.struct_id,
sa.struct_name,
ext.standard_weight,
bucket.storagevehicle_code AS vehicle_code
FROM
md_pb_bucketrecord bucket
LEFT JOIN md_me_materialbase mb ON mb.material_id = bucket.material_id
LEFT JOIN st_ivt_structattr sa ON sa.storagevehicle_code = bucket.storagevehicle_code
LEFT JOIN md_me_stockmaterialext ext ON ext.material_id = mb.material_id
WHERE
bucket.bucketunique = 输入.bucket_code
AND

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_TEST_FACTORYWARRANTY001.wql
View File

@@ -100,6 +100,7 @@
WHERE
dtl.material_uuid = 输入.material_id
AND point.inspection_item_type = '01'
AND dtl.is_delete = '0'
ENDSELECT
ENDQUERY

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql
View File

@@ -179,8 +179,8 @@
LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
LEFT JOIN em_bi_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id
LEFT JOIN sys_dict_detail detail ON detail.`value` = dtl.source_bill_type
LEFT JOIN sys_dict dict ON dict.dict_id = detail.dict_id
AND dict.`name` LIKE 'ST_INV_TYPE%'
INNER JOIN sys_dict dict ON dict.dict_id = detail.dict_id
AND dict.`name` LIKE 'EM_DEVICE_WX_INVTYPE%'
LEFT JOIN (
SELECT
count(*) AS assign_qty,
@@ -194,6 +194,10 @@
) a ON a.iostorinvdtl_id = dtl.iostorinvdtl_id
where
mst.bill_code = 输入.bill_code
UNION
ENDSELECT
ENDQUERY
ENDIF