From 4b121f330b80f7b6c95a53ac2943119e6e86599a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?=
 <zhangjiangwei2000@outlook.com>
Date: Fri, 14 Apr 2023 13:30:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql |   8 --------
 .../src/main/java/org/nl/wms/wms.xls          | Bin 264192 -> 264192 bytes
 .../src/views/wms/pdm/workerorder/index.vue   |   1 -
 .../src/views/wms/sch/task/index.vue          |   4 ++--
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
index ea15295..0f5ba51 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
@@ -55,19 +55,11 @@
 		SELECT
         	ShiftOrder.*,
         	material.material_code,
-<<<<<<< Updated upstream
-        	material.material_name,
-        	material.material_spec
-        FROM
-        	PDM_BD_WORKORDER ShiftOrder
-        	LEFT JOIN md_me_materialbase material ON material.material_id = ShiftOrder.material_id
-=======
         	device.device_name
         FROM
         	PDM_BD_WORKORDER ShiftOrder
         	LEFT JOIN md_me_materialbase material ON material.material_id = ShiftOrder.material_id
         	LEFT JOIN pdm_bi_device device ON ShiftOrder.device_id = device.device_id
->>>>>>> Stashed changes
         WHERE
         	ShiftOrder.is_delete = '0'
             OPTION 输入.unFinish <> ""
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
index 7d35c684b44f733dc8d928709188f2ee9e610297..737a18507d0eea34cc046bf21814a22c5b3015bb 100644
GIT binary patch
delta 395
zcmZpeAkZ*DU_&ko%ZiuI6DJq4eCAcyVB$P6?<S)INTj)twY`v)aeE;v(+3uAX$B4k
z1_nk3X$I--Ib2LXX7gS+X8~3`L3g3^#P-5vOxp{WF@IL$1@l3M#GG-SxV`W!^K)KC
zgXxjCnU$D=8MfEnX1*%Kw2pcDnRm=e)63p5%djvoyy2XF?j5tj^lk5$MVJ^EKyrT>
z8K&R6%`CJ1*?VRdMv&l}56ruPf-62U>oY}aPQUq)Sr23m=O-ZTs5#vdL<9MmAQ~t?
z^AoccqwDk|pP2oCx`aP7s{<+P&&)AQdb-nReugMI`I%Xhnc->h^sgX+IF;$DU%;kp
z5B<U{&gSQ6;ArGz;$-AxfsB=Sxm*IAY?YkMoJ<^zTwEPpU5%VgU5z0aDC_QQtK{tL
r?CN6SX5waH;N)fr!fxAl{bG(|;cN)n2M#yp$%-uU+a3NhAK(B0q~nFy

delta 397
zcmZpeAkZ*DU_&ko%ev~RrIQO;KJ#9fY&*3y?<S)INTj)twY`v)aeE;v(+3uA6$TCl
z1_nk36$X{<Ib2LXX7euSw+Aau2+N&X+FrPfX?x)^=Fe)pU_Q{01dF1nrP~Y7GC${K
zRG1!ln^}qJd+_$!+ss#mn0mygpLxfuG`;K{vkZ$)`Ww#a=iV_ZOyBm7S%gWd5hVAQ
zIXc*X`h(ldQrn-sXJ%n!(n+8G<^%I?#^C8IJ~HcrxHmsC>w##_PY~J?L<3FEgz{&8
zV%B10n119Fvmc}3bm7m;>Oji+Gjj|`(ag^fO(#DyYciLV<WK(!6;S;Gme?Npg;|`<
z&(g@!z{1Sb0*IZFu@WzrOMsKDl7*{<v!$b{vzeo#iJ7^hDFg#$-JOAwjusY{u4V?7
iPG*K6Y_@&ZFXlKFPKGBD;E-dUtjHq2-Qhp;0S*9JOo@&F

diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
index 692e83e..162fe56 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
@@ -231,7 +231,6 @@
         </el-table-column>
         <el-table-column prop="planproducestart_date" label="计划开始时间" min-width="150" show-overflow-tooltip />
         <el-table-column prop="planproduceend_date" label="计划结束时间" min-width="150" show-overflow-tooltip />
-        <el-table-column v-if="false" prop="material_id" label="物料标识" />
         <el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
         <el-table-column prop="material_name" label="物料" width="100" show-overflow-tooltip />
         <el-table-column prop="plan_qty" label="计划数量" />
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index bf91f80..301cb27 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -113,8 +113,8 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="50" />
-        <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
-        <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
+        <el-table-column v-if="false" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
+        <el-table-column v-if="false" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
         <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_type" label="任务类型" />
         <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip >