From fb88546733d7992c16f038e26dc9dce8144c1550 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Mon, 28 Nov 2022 12:23:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/st/in/service/impl/HandNewMaterialServiceImpl.java   | 5 +++++
 .../pdm/service/impl/WorkProcedureParaServiceImpl.java       | 2 +-
 .../src/views/wms/basedata/pdm/workProcedurePara/index.vue   | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java
index e7dcaa73..4535a807 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java
@@ -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);
+
+            if (ObjectUtil.isEmpty(bucket_jo)) {
+                throw new PdaRequestException("桶号:"+row.get("bucketunique")+"查不到对应物料批次记录！");
+            }
+
             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")) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureParaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureParaServiceImpl.java
index 880f1cdf..d61a8ad2 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureParaServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureParaServiceImpl.java
@@ -48,7 +48,7 @@ public class WorkProcedureParaServiceImpl implements WorkProcedureParaService {
         if (StrUtil.isNotEmpty(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();
         return json;
     }
diff --git a/mes/qd/src/views/wms/basedata/pdm/workProcedurePara/index.vue b/mes/qd/src/views/wms/basedata/pdm/workProcedurePara/index.vue
index 1c0022ee..d87e7166 100644
--- a/mes/qd/src/views/wms/basedata/pdm/workProcedurePara/index.vue
+++ b/mes/qd/src/views/wms/basedata/pdm/workProcedurePara/index.vue
@@ -159,6 +159,9 @@ export default {
         para_name: [
           { required: true, message: '项点名称不能为空', trigger: 'blur' }
         ],
+        ext_name: [
+          { required: true, message: '外部名称不能为空', trigger: 'blur' }
+        ],
         workprocedure_id: [
           { required: true, message: '工序不能为空', trigger: 'blur' }
         ]