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

优化

Browse Source
This commit is contained in:
zds
2022-11-28 12:23:03 +08:00
parent ae1202cf80
commit fb88546733
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java
View File

@@ -390,6 +390,11 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
//校验桶状态 //校验桶状态
JSONObject bucket_jo = bucket_wql.query("bucketunique = '" + row.get("bucketunique") + "' AND material_id = '" + row.get("material_id") + "' AND pcsn = '" + row.get("pcsn") + "'").uniqueResult(0); JSONObject bucket_jo = bucket_wql.query("bucketunique = '" + row.get("bucketunique") + "' AND material_id = '" + row.get("material_id") + "' AND pcsn = '" + row.get("pcsn") + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(bucket_jo)) {
throw new PdaRequestException("桶号:"+row.get("bucketunique")+"查不到对应物料批次记录！");
}
if (!ObjectUtil.isEmpty(bucket_jo) && !bucket_jo.getString("status").equals("01")) { if (!ObjectUtil.isEmpty(bucket_jo) && !bucket_jo.getString("status").equals("01")) {
//如果为软废采购入库，判断是否为新加，不是新加的不需要判断是否组盘 //如果为软废采购入库，判断是否为新加，不是新加的不需要判断是否组盘
if (!flag.equals("5") && row.containsKey("is_new") && row.get("is_new").equals("0")) { if (!flag.equals("5") && row.containsKey("is_new") && row.get("is_new").equals("0")) {

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureParaServiceImpl.java
View File

@@ -48,7 +48,7 @@ public class WorkProcedureParaServiceImpl implements WorkProcedureParaService {
if (StrUtil.isNotEmpty(workprocedure_id)) { if (StrUtil.isNotEmpty(workprocedure_id)) {
where += " and workprocedure_id = '" + workprocedure_id + "'"; where += " and workprocedure_id = '" + workprocedure_id + "'";
} }
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1= 1 " + where, "order_index "); ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1= 1 " + where, "para_code ");
final JSONObject json = rb.pageResult(); final JSONObject json = rb.pageResult();
return json; return json;
} }

3
mes/qd/src/views/wms/basedata/pdm/workProcedurePara/index.vue
View File

@@ -159,6 +159,9 @@ export default {
para_name: [ para_name: [
{ required: true, message: '项点名称不能为空', trigger: 'blur' } { required: true, message: '项点名称不能为空', trigger: 'blur' }
], ],
ext_name: [
{ required: true, message: '外部名称不能为空', trigger: 'blur' }
],
workprocedure_id: [ workprocedure_id: [
{ required: true, message: '工序不能为空', trigger: 'blur' } { required: true, message: '工序不能为空', trigger: 'blur' }
] ]