From 47c6039853f4276c25aa613db635fb0bffc280e1 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Wed, 19 Jul 2023 14:38:34 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=B7=A5=E5=8D=95=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/config/MetaDataHandler.java   | 45 -------------------
 .../pda/controller/TmpKZController.java       |  1 +
 .../packageWrap/WrapSendEmptyTask.java        |  3 +-
 .../wms/product_manage/workorder/index.vue    | 17 +++----
 4 files changed, 11 insertions(+), 55 deletions(-)
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/config/MetaDataHandler.java

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/MetaDataHandler.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/MetaDataHandler.java
deleted file mode 100644
index 6e9b4983..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/config/MetaDataHandler.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.nl.config;
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import org.apache.ibatis.reflection.MetaObject;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-
-
-/**
- * 自动填充公共字段
- */
-@Component
-public class MetaDataHandler implements MetaObjectHandler
-{
-     /**
-      * 插入操作自动填充
-      */
-     @Override
-     public void insertFill(MetaObject metaObject)
-     {
-          //不一定有修改或删除字段，比如交易记录不能删除也不能修改
-          if(metaObject.hasSetter("is_delete"))
-          {
-               metaObject.setValue("is_delete", 0);
-          }
-          if(metaObject.hasSetter("update_time"))
-          {
-               metaObject.setValue("update_time", new Date());
-          }
-          metaObject.setValue("create_time", new Date());
-     }
-
-     /**
-      * 更新操作自动填充
-      */
-     @Override
-     public void updateFill(MetaObject metaObject)
-     {
-          if(metaObject.hasSetter("update_time"))
-          {
-               metaObject.setValue("update_time", new Date());
-          }
-     }
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java
index 70b1330c..21fce5c4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java
@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.TableDataInfo;
 import org.nl.common.enums.AcsTaskEnum;
 import org.nl.common.enums.StatusEnum;
 import org.nl.common.utils.RedissonUtils;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapSendEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapSendEmptyTask.java
index 78f976b0..cb7e751e 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapSendEmptyTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapSendEmptyTask.java
@@ -99,7 +99,6 @@ public class WrapSendEmptyTask extends AbstractAcsTask {
 
     @Override
     public String createTask(JSONObject param) {
-        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
         String start_point_code = param.getString("device_code");
         if(StrUtil.isEmpty(start_point_code)) {
             throw new BadRequestException("起点不能为空！");
@@ -149,7 +148,7 @@ public class WrapSendEmptyTask extends AbstractAcsTask {
             task.put("remark", ex.getMessage());
             task.put("update_time", DateUtil.now());
             task.put("task_status", StatusEnum.TASK_START_ERROR.getCode());
-            taskTab.update(task);
+            taskService.updateById(task.toJavaObject(SchBaseTask.class));
         }
         return taskdtl_id;
     }
diff --git a/mes/qd/src/views/wms/product_manage/workorder/index.vue b/mes/qd/src/views/wms/product_manage/workorder/index.vue
index d76e80b8..de2d4731 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/index.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue
@@ -290,13 +290,13 @@
           <el-form-item v-if="false" label="物料标识" prop="material_id">
             <el-input v-model="form.material_id" style="width: 200px;" />
           </el-form-item>
-          <el-form-item label="物料编码" prop="material_code">
+          <el-form-item label="物料编码" prop="materialCode">
             <el-input
-              v-model="form.material_code"
+              v-model="form.materialCode"
               style="width: 200px;"
               clearable
               @focus="materialShow=true"
-              @clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
+              @clear="form.material_id='',form.materialCode='',form.material_name='',form.material_spec=''"
             />
           </el-form-item>
           <el-form-item label="物料名称" prop="material_name">
@@ -492,7 +492,7 @@
         <el-table-column prop="outupperlimit_qty" label="满筐数量" />
         <el-table-column prop="dq_real_qty" label="电气实时数" width="100" show-overflow-tooltip />
         <el-table-column prop="real_qty" label="报工总数" />
-        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+        <el-table-column prop="materialCode" label="物料编码" :min-width="flexWidth('materialCode',crud.data,'物料编码')" />
         <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
         <el-table-column prop="device_code" label="当前设备编码" :min-width="flexWidth('device_code',crud.data,'当前设备编码')" />
         <el-table-column
@@ -595,6 +595,7 @@ import crudClassstandard from '@/api/wms/basedata/master/classstandard'
 import AddDialog from '@/views/wms/product_manage/workorder/AddDialog'
 import UploadDialog from '@/views/wms/product_manage/workorder/UploadDialog'
 import ReplaceDeviceDialog from '@/views/wms/product_manage/workorder/ReplaceDeviceDialog'
+import { openStart } from './produceshiftorder'
 
 const defaultForm = {
   workorder_id: null,
@@ -607,7 +608,7 @@ const defaultForm = {
   person_real_qty: null,
   dq_real_qty: null,
   material_id: null,
-  material_code: null,
+  materialCode: null,
   material_weight: null,
   material_name: null,
   material_spec: null,
@@ -702,7 +703,7 @@ export default {
         plan_qty: [
           { required: true, message: '计划数量不能为空', trigger: 'blur' }
         ],
-        material_code: [
+        materialCode: [
           { required: true, message: '物料编码不能为空', trigger: 'change' }
         ],
         order_status: [
@@ -936,7 +937,7 @@ export default {
     // 新增编辑给form表单物料相关信息赋值
     setMaterValue(row) {
       this.form.material_id = row.material_id
-      this.form.material_code = row.material_code
+      this.form.materialCode = row.material_code
       this.form.material_name = row.material_name
       this.form.material_spec = row.material_spec
     },
@@ -990,7 +991,7 @@ export default {
     [CRUD.HOOK.beforeToEdit]() {
       console.log(this.form.package_ext)
       console.log(this.form)
-      if (this.form.package_ext !== undefined && this.form.package_ext !== null && JSON.stringify(this.form.package_ext).length > 3) {
+      if (this.form.package_ext != undefined && this.form.package_ext != null && JSON.stringify(this.form.package_ext).length > 3) {
         this.form.package_ext = JSON.parse(this.form.package_ext)
       }
     },