From 7ab51798063e8b081512870f481af03cdbf20567 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Thu, 16 Oct 2025 10:50:41 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/role/impl/SysRoleServiceImpl.java |   6 +-
 .../pdm/order/service/dao/PdmBdWorkorder.java | 194 +++++++------
 nladmin-ui/src/i18n/langs/zh-CN.js            |   2 +-
 .../src/layout/components/Sidebar/Logo.vue    |   2 +-
 .../src/views/wms/pdm/workerorder/index.vue   | 266 ++++++++++++++----
 5 files changed, 325 insertions(+), 145 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java
index c5d098c..b85b7a2 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java
@@ -133,9 +133,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     public List<String> getPermissionList(JSONObject userDto) {
         List<String> permission = new LinkedList<>();
         // 查看是否为管理员
-        if (userDto.getBoolean("is_admin")) {
-            permission.add("admin");
-        }
+//        if (userDto.getBoolean("is_admin")) {
+//            permission.add("admin");
+//        }
         permission.addAll(sysMenuMapper.getPermissionByUserId(userDto.getString("user_id")));
         return permission;
     }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/order/service/dao/PdmBdWorkorder.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/order/service/dao/PdmBdWorkorder.java
index 0aa3933..ac86307 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/order/service/dao/PdmBdWorkorder.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/order/service/dao/PdmBdWorkorder.java
@@ -1,125 +1,133 @@
 package org.nl.wms.pdm.order.service.dao;
 
-    import com.baomidou.mybatisplus.annotation.IdType;
-    import com.baomidou.mybatisplus.annotation.TableId;
-    import com.baomidou.mybatisplus.annotation.TableName;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-    import java.math.BigDecimal;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
-* @description /
-* @author lyd
-* @date 2025-07-14
-**/
+ * @author lyd
+ * @description /
+ * @date 2023-05-05
+ **/
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("pdm_bd_workorder")
 public class PdmBdWorkorder implements Serializable {
 
-private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     @TableId(value = "workorder_id", type = IdType.NONE)
-    /** 工单标识 */
     private String workorder_id;
 
-    /** 工单编号 */
     private String workorder_code;
 
-    /** 生产日期 */
-    private String produce_date;
-
-    /** 计划数量 */
     private BigDecimal plan_qty;
 
-    /** 实际数量 */
     private BigDecimal real_qty;
 
-    /** 物料标识 */
+    private BigDecimal plan_weight;
+
+    private BigDecimal real_weight;
+
     private String material_id;
 
-    /** 载具类型 */
-    private String vehicle_type;
+    private String raw_material_code;
 
-    /** 计划开始时间 */
-    private String planproducestart_date;
+    private String produce_order;
 
-    /** 计划结束时间 */
-    private String planproduceend_date;
-
-    /** 实际开始时间 */
-    private String realproducestart_date;
-
-    /** 实际结束时间 */
-    private String realproduceend_date;
-
-    /** 区域编码 */
-    private String region_code;
-
-    /** 区域名称 */
-    private String region_name;
-
-    /** 是否需要AGV搬运 */
-    private String is_needmove;
-
-    /** 工单类型 */
-    private String workorder_type;
-
-    /** 回传MES状态 */
-    private String passback_status;
-
-    /** 车间编码 */
-    private String workshop_code;
-
-    /** 外部标识 */
-    private String ext_id;
-
-    /** 是否删除 */
-    private Boolean is_delete;
-
-    /** 创建人 */
-    private String create_id;
-
-    /** 创建人 */
-    private String create_name;
-
-    /** 创建时间 */
-    private String create_time;
-
-    /** 修改人 */
-    private String update_id;
-
-    /** 修改人 */
-    private String update_name;
-
-    /** 修改时间 */
-    private String update_time;
-
-    /** 设备标识 */
-    private String device_id;
-
-    /** 设备名称 */
-    private String device_code;
-
-    /** 所属工序 */
-    private String workorder_procedure;
-
-    /** 工单状态 */
-    private String order_status;
-
-    /** 外部数据 */
-    private String ext_data;
-
-    /** 开工人 */
-    private String operator;
-
-    /** 生产批次号 */
     private String batch_no;
 
-    /** 班组 */
     private String team;
 
+    private String produce_date;
+
+    private String vehicle_type;
+
+    private String planproducestart_date;
+
+    private String planproduceend_date;
+
+    private String realproducestart_date;
+
+    private String realproduceend_date;
+
+    private Integer standing_time;
+
+    private String point_code;
+
+    private String point_name;
+
+    private String region_code;
+
+    private String region_name;
+
+    private String workorder_status;
+
+    private Boolean is_needmove;
+
+    private String workorder_type;
+
+    @TableField(exist = false)
+    private String production_order;
+
+    private String passback_status;
+
+    private String workshop_code;
+
+    private String ext_id;
+
+    private String ext_data;
+
+    private Boolean is_delete;
+
+    private String create_id;
+
+    private String create_name;
+
+    private String create_time;
+
+    private String update_id;
+
+    private String update_name;
+
+    private String update_time;
+
+    private Boolean is_urgent;
+    private String operator;
+
+    private Integer qualified_qty;
+
+    private Integer unqualified_qty;
+    private Integer priority;
+
+    @TableField(exist = false)
+    private String material_name;
+
+    @TableField(exist = false)
+    private String material_code;
+
+    @TableField(exist = false)
+    private String material_spec;
+    @TableField(exist = false)
+    private String half_material_code;
+
+    @TableField(exist = false)
+    private String order_no;
+    @TableField(exist = false)
+    private String custer_no;
+    @TableField(exist = false)
+    private int order_subnum;
+    @TableField(exist = false)
+    private int guadansum;
+    @TableField(exist = false)
+    private String pack_method;
+    @TableField(exist = false)
+    private String row_num;
+
 }
diff --git a/nladmin-ui/src/i18n/langs/zh-CN.js b/nladmin-ui/src/i18n/langs/zh-CN.js
index 3556d31..120e3f5 100644
--- a/nladmin-ui/src/i18n/langs/zh-CN.js
+++ b/nladmin-ui/src/i18n/langs/zh-CN.js
@@ -2,7 +2,7 @@ export default {
   'lang': 'zh',
   // 平台
   'platform': {
-    'title': '诺力开发平台',
+    'title': 'LMS系统',
     'tip1': '用户名不能为空',
     'tip2': '密码不能为空',
     'tip3': '验证码不能为空'
diff --git a/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/nladmin-ui/src/layout/components/Sidebar/Logo.vue
index 75734b1..3032c08 100644
--- a/nladmin-ui/src/layout/components/Sidebar/Logo.vue
+++ b/nladmin-ui/src/layout/components/Sidebar/Logo.vue
@@ -26,7 +26,7 @@ export default {
   },
   data() {
     return {
-      title: '诺力开发平台',
+      title: 'LMS系统',
       logo: Logo,
       title_param: 'platform'
     }
diff --git a/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
index 09e6b41..cb4ff2f 100644
--- a/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ b/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
@@ -9,72 +9,222 @@
         <rrOperation :crud="crud" />
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="!(crud.selections[0]) || crud.selections[1]"
+          @click="submits(crud.selections[0])"
+        >
+          开工
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+        >
+          同步
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="danger"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="!(crud.selections[0]) || crud.selections[1]"
+        >
+          强制完工
+        </el-button>
+      </crudOperation>
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="工单编号">
-            <el-input v-model="form.workorder_code" style="width: 370px;" />
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="820px"
+      >
+        <el-form
+          ref="form"
+          style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          size="mini"
+          label-width="135px"
+          label-suffix=":"
+        >
+          <el-form-item v-if="false" label="所属车间">
+            <el-select
+              v-model="form.workshop_code"
+              placeholder="请选择"
+              style="width: 240px;"
+            >
+              <el-option
+                v-for="item in workShopList"
+                :label="item.workshop_name"
+                :value="item.workshop_code"
+              />
+            </el-select>
           </el-form-item>
-          <el-form-item label="生产日期">
-            <el-input v-model="form.produce_date" style="width: 370px;" />
+          <el-form-item label="物料名称" prop="material_name">
+            <el-input v-model="form.material_name" style="width: 240px;" @focus="getMaterial(1)" />
           </el-form-item>
-          <el-form-item label="计划数量">
-            <el-input v-model="form.plan_qty" style="width: 370px;" />
+          <el-form-item label="物料编码">
+            <el-input v-model="form.material_code" style="width: 240px;" disabled />
           </el-form-item>
-          <el-form-item label="实际数量">
-            <el-input v-model="form.real_qty" style="width: 370px;" />
+          <el-form-item label="物料规格">
+            <el-input v-model="form.material_spec" style="width: 240px;" disabled />
           </el-form-item>
-          <el-form-item label="物料标识">
-            <el-input v-model="form.material_id" style="width: 370px;" />
+          <el-form-item label="计划数量" prop="plan_qty">
+            <el-input-number
+              v-model.number="form.plan_qty"
+              :disabled="form.region_code === 'FJ'"
+              :min="0"
+              style="width: 240px;"
+            />
           </el-form-item>
-          <el-form-item label="载具类型">
-            <el-input v-model="form.vehicle_type" style="width: 370px;" />
+          <el-form-item label="计划开始时间" prop="planproducestart_date">
+            <el-date-picker
+              v-model="form.planproducestart_date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetime"
+              style="width: 240px;"
+              placeholder="选择日期时间"
+            />
           </el-form-item>
-          <el-form-item label="计划开始时间">
-            <el-input v-model="form.planproducestart_date" style="width: 370px;" />
+          <el-form-item label="计划结束时间" prop="planproduceend_date">
+            <el-date-picker
+              v-model="form.planproduceend_date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetime"
+              style="width: 240px;"
+              placeholder="选择日期时间"
+            />
           </el-form-item>
-          <el-form-item label="计划结束时间">
-            <el-input v-model="form.planproduceend_date" style="width: 370px;" />
+          <el-form-item v-if="crud.status.edit" label="实际开始时间">
+            <el-date-picker
+              v-model="form.realproducestart_date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetime"
+              style="width: 240px;"
+              placeholder="选择日期时间"
+            />
           </el-form-item>
-          <el-form-item label="实际开始时间">
-            <el-input v-model="form.realproducestart_date" style="width: 370px;" />
+          <el-form-item v-if="crud.status.edit" label="实际结束时间">
+            <el-date-picker
+              v-model="form.realproduceend_date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetime"
+              style="width: 240px;"
+              placeholder="选择日期时间"
+            />
           </el-form-item>
-          <el-form-item label="实际结束时间">
-            <el-input v-model="form.realproduceend_date" style="width: 370px;" />
+          <el-form-item label="所属工序" prop="region_code">
+            <el-select
+              v-model="form.region_code"
+              filterable
+              placeholder="请选择"
+              style="width: 240px;"
+              @change="setRegionName"
+            >
+              <el-option
+                v-for="item in regionList"
+                :key="item.region_code"
+                :label="item.region_code"
+                :value="item.region_code"
+              >
+                <span style="float: left">{{ item.region_name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.region_code }}</span>
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="区域编码">
-            <el-input v-model="form.region_code" style="width: 370px;" />
+          <el-form-item label="工序名称">
+            <el-input v-model="form.region_name" style="width: 240px;" disabled />
           </el-form-item>
-          <el-form-item label="区域名称">
-            <el-input v-model="form.region_name" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="是否需要AGV搬运">
-            <el-input v-model="form.is_needmove" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="工单类型">
-            <el-input v-model="form.workorder_type" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="车间编码">
-            <el-input v-model="form.workshop_code" style="width: 370px;" />
+          <el-form-item label="设备编码" prop="point_code">
+            <el-select
+              v-model="form.point_code"
+              filterable
+              placeholder="请选择"
+              style="width: 240px;"
+              @change="setPointName"
+            >
+              <el-option
+                v-for="item in pointList"
+                :key="item.point_code"
+                :label="item.point_code"
+                :value="item.point_code"
+              >
+                <span style="float: left">{{ item.point_name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.point_code }}</span>
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="设备名称">
-            <el-input v-model="form.device_code" style="width: 370px;" />
+            <el-input v-model="form.point_name" style="width: 240px;" disabled />
           </el-form-item>
-          <el-form-item label="所属工序">
-            <el-input v-model="form.workorder_procedure" style="width: 370px;" />
+          <el-form-item label="静置时间(分钟)" prop="standing_time">
+            <el-input-number
+              v-model.number="form.standing_time"
+              :min="0"
+              :max="999"
+              style="width: 240px;"
+            />
           </el-form-item>
-          <el-form-item label="工单状态">
-            <el-input v-model="form.order_status" style="width: 370px;" />
+          <el-form-item v-if="crud.status.edit" label="实际数量" prop="real_qty">
+            <el-input-number
+              v-model.number="form.real_qty"
+              :min="0"
+              style="width: 240px;"
+            />
           </el-form-item>
-          <el-form-item label="开工人">
-            <el-input v-model="form.operator" style="width: 370px;" />
+          <el-form-item v-if="crud.status.edit && form.region_code === 'YZ'" label="计划重量">
+            <el-input-number
+              v-model.number="form.plan_weight"
+              :min="0"
+              style="width: 240px;"
+            />
           </el-form-item>
-          <el-form-item label="生产批次号">
-            <el-input v-model="form.batch_no" style="width: 370px;" />
+          <el-form-item v-if="crud.status.edit && form.region_code === 'YZ'" label="实际重量">
+            <el-input-number
+              v-model.number="form.real_weight"
+              :min="0"
+              style="width: 240px;"
+            />
           </el-form-item>
-          <el-form-item label="班组">
-            <el-input v-model="form.team" style="width: 370px;" />
+          <el-form-item label="载具类型">
+            <el-select
+              v-model="form.vehicle_type"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 240px;"
+            >
+              <el-option
+                v-for="item in dict.vehicle_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否自动搬运" prop="is_needmove">
+            <el-radio-group v-model="form.is_needmove" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="是否加急" prop="is_needmove">
+            <el-radio-group v-model="form.is_urgent" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -170,6 +320,7 @@ const defaultForm = {
 }
 export default {
   name: 'PdmBdWorkorder',
+  dicts: ['vehicle_type', 'pdm_workorder_status'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
@@ -186,6 +337,27 @@ export default {
       permission: {
       },
       rules: {
+        material_code: [
+          { required: true, message: '物料不能为空', trigger: 'blur' }
+        ],
+        plan_qty: [
+          { required: true, message: '计划数量不能为空', trigger: 'blur' }
+        ],
+        planproducestart_date: [
+          { required: true, message: '计划开始不能为空', trigger: 'change' }
+        ],
+        planproduceend_date: [
+          { required: true, message: '计划结束不能为空', trigger: 'change' }
+        ],
+        point_code: [
+          { required: true, message: '设备编码不能为空', trigger: 'change' }
+        ],
+        region_code: [
+          { required: true, message: '区域编码不能为空', trigger: 'change' }
+        ]
+        /* workorder_type: [
+          { required: true, message: '工单类型不能为空', trigger: 'blur' }
+        ]*/
       },
       queryTypeOptions: [
         { key: 'workorder_code', display_name: '工单编号' }