From b37f474fbc0599beda59b5589fe09722c62ad17b Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 09:55:59 +0800
Subject: [PATCH 01/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=BB=BA=E6=A8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/factory/index.vue | 49 ++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/views/wms/factory/index.vue b/src/views/wms/factory/index.vue
index a263580..9d534ba 100644
--- a/src/views/wms/factory/index.vue
+++ b/src/views/wms/factory/index.vue
@@ -10,9 +10,15 @@
 				/>
 			</el-form-item>
 			<el-form-item label="工厂状态" prop="status">
-          <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
+				<el-input
+					v-model="queryParams.status"
+					placeholder="请输入工厂状态(1/0)"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+          <!-- <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
             <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
-          </el-select>
+          </el-select> -->
       </el-form-item>
 			<el-form-item>
 			<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -51,16 +57,15 @@
 			:default-expand-all="isExpandAll"
 			:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
 		>
-
 			<el-table-column label="工厂名称" align="center" prop="factoryName" />
 			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
 			<el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column prop="status" label="是否启用" align="center" >
-         <template slot-scope="scope">
-            {{ scope.row.status == 1 ? "是" : "否" }}
-         </template>
-      </el-table-column>
+      		<el-table-column label="创建时间" align="center" prop="createTime" />
+      		<el-table-column prop="status" label="是否启用" align="center" >
+         		<template slot-scope="scope">
+            		{{ scope.row.status == 1 ? "是" : "否" }}
+         		</template>
+      		</el-table-column>
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button
@@ -91,29 +96,29 @@
 		<!-- 添加或修改工厂模型对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-form-item label="父工厂名" prop="parentId">
+				<el-form-item label="父工厂名" prop="parentId" style="width:430px">
 					<treeselect v-model="form.parentId" :options="factoryOptions" :normalizer="normalizer" placeholder="请选择父工厂id" />
 				</el-form-item>
-				<el-form-item label="工厂名称" prop="factoryName">
+				<el-form-item label="工厂名称" prop="factoryName" style="width:430px">
 					<el-input v-model="form.factoryName" placeholder="请输入工厂名称" />
 				</el-form-item>
-				<el-form-item label="工厂编码" prop="factoryCode">
-        	<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
-   			</el-form-item>
-				<el-form-item label="负责人" prop="leader">
+				<el-form-item label="工厂编码" prop="factoryCode" style="width:430px">
+        			<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
+   				</el-form-item>
+				<el-form-item label="负责人" prop="leader" style="width:430px">
 					<el-input v-model="form.leader" placeholder="请输入负责人" />
 				</el-form-item>
-				<el-form-item label="联系电话" prop="phone">
+				<el-form-item label="联系电话" prop="phone" style="width:430px">
 					<el-input v-model="form.phone" placeholder="请输入联系电话" />
 				</el-form-item>
-				<el-form-item label="邮箱" prop="email">
+				<el-form-item label="邮箱" prop="email" style="width:430px">
 					<el-input v-model="form.email" placeholder="请输入邮箱" />
 				</el-form-item>
-				<el-form-item label="是否启用" prop="status">
-          <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
-            <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
-          </el-select>
-        </el-form-item>
+				<el-form-item label="是否启用" prop="status" >
+          			<el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:350px">
+            			<el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
+          			</el-select>
+        		</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>

From 1cdf94475f7925c38fcbea54ce87f5df3ba9cc7c Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 10:06:43 +0800
Subject: [PATCH 02/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/warehouse/index.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/warehouse/index.vue b/src/views/wms/warehouse/index.vue
index 4b84b7b..3606462 100644
--- a/src/views/wms/warehouse/index.vue
+++ b/src/views/wms/warehouse/index.vue
@@ -119,35 +119,35 @@
 		<!-- 添加或修改仓库管理对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="120px">
-				<el-form-item label="仓库编码" prop="warehouseCode">
+				<el-form-item label="仓库编码" prop="warehouseCode" style="width:430px">
 					<el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
 				</el-form-item>
-				<el-form-item label="仓库类别" prop="warehouseType">
-          <el-select v-model="form.warehouseType" placeholder="请选择仓库类别"  @change="$forceUpdate()" clearable>
+				<el-form-item label="仓库类别" prop="warehouseType" >
+          <el-select v-model="form.warehouseType" placeholder="请选择仓库类别"  @change="$forceUpdate()" clearable style="width:310px">
             <el-option v-for="item in warehouseTypeOptions" :key="item.warehouseType" :label="item.label" :value="item.warehouseType"></el-option>
           </el-select>
          </el-form-item>
-				<el-form-item label="仓库名称" prop="warehouseName">
+				<el-form-item label="仓库名称" prop="warehouseName" style="width:430px">
 					<el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
 				</el-form-item>
-				<el-form-item label="工厂编码" prop="factoryCode">
+				<el-form-item label="工厂编码" prop="factoryCode" style="width:430px">
 					<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
 				</el-form-item>
-				<el-form-item label="工厂名称" prop="factoryName">
+				<el-form-item label="工厂名称" prop="factoryName" style="width:430px">
 					<el-input v-model="form.factoryName" placeholder="请输入工厂名称" />
 				</el-form-item>
 				<el-form-item label="是否启用" prop="activeFlag">
-				  <el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
+				  <el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:310px">
             <el-option v-for="item in options" :key="item.activeFlag" :label="item.label" :value="item.activeFlag"></el-option>
           </el-select>
 				</el-form-item>
 				<el-form-item label="是否按线体入库" prop="lineFlag">
-				  <el-select v-model="form.lineFlag" placeholder="请选择是否按照线体入库"  @change="$forceUpdate()" clearable>
+				  <el-select v-model="form.lineFlag" placeholder="请选择是否按照线体入库"  @change="$forceUpdate()" clearable style="width:310px">
             <el-option v-for="item in lineFlagOptions" :key="item.lineFlag" :label="item.label" :value="item.lineFlag"></el-option>
           </el-select>
 				</el-form-item>
-				<el-form-item label="仓库类型" prop="warehouseType2">
-					<el-select v-model="form.warehouseType2" placeholder="请选择仓库类型"  @change="$forceUpdate()" clearable>
+				<el-form-item label="仓库类型" prop="warehouseType2" >
+					<el-select v-model="form.warehouseType2" placeholder="请选择仓库类型"  @change="$forceUpdate()" clearable style="width:310px">
             <el-option v-for="item in warehouseType2Options" :key="item.warehouseType2" :label="item.label" :value="item.warehouseType2"></el-option>
           </el-select>
 				</el-form-item>

From 02f01ad36a9542b251f800af86ef23860178e8b9 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 10:17:37 +0800
Subject: [PATCH 03/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E5=BA=93=E5=8C=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/area/index.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/area/index.vue b/src/views/wms/area/index.vue
index 2244854..1cc3e42 100644
--- a/src/views/wms/area/index.vue
+++ b/src/views/wms/area/index.vue
@@ -118,27 +118,27 @@
 
 		<!-- 添加或修改库区对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+			<el-form ref="form" :model="form" :rules="rules" label-width="100px" >
 				<el-row :gutter="10" class="mb8">
       			    <el-col :span="12">
-                  		<el-form-item label="库区编码" prop="areaCode">
+                  		<el-form-item label="库区编码" prop="areaCode" style="width:450px">
       					    <el-input v-model="form.areaCode" placeholder="请输入库区编码" />
       				   	</el-form-item>
                 	</el-col>
                 	<el-col :span="12">
-                  		<el-form-item label="库区描述" prop="areaDesc">
+                  		<el-form-item label="库区描述" prop="areaDesc" style="width:450px">
                 			<el-input v-model="form.areaDesc" placeholder="请输入库区描述(名称)" />
                 		</el-form-item>
                 	</el-col>
               		</el-row>
     			<el-row :gutter="10" class="mb8">
           			<el-col :span="12">
-                      	<el-form-item label="区域编码" prop="regionCode">
+                      	<el-form-item label="区域编码" prop="regionCode" style="width:450px">
           					<el-input v-model="form.regionCode" placeholder="请输入区域编码" />
           				</el-form-item>
                     </el-col>
                     <el-col :span="12">
-                      	<el-form-item label="仓库编码" prop="whCode">
+                      	<el-form-item label="仓库编码" prop="whCode" style="width:450px">
                     		<el-input v-model="form.whCode" placeholder="请输入仓库编码" />
                     	</el-form-item>
                     </el-col>
@@ -205,13 +205,13 @@
 				<el-row :gutter="10" class="mb8">
                   	<el-col :span="12">
 				<el-form-item label="是否启用" prop="activeFlag">
-                	<el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
+                	<el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:350px">
            				<el-option v-for="item in options" :key="item.activeFlag" :label="item.label" :value="item.activeFlag"></el-option>
           			</el-select>
         		</el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="工厂编码" prop="factoryCode">
+                        <el-form-item label="工厂编码" prop="factoryCode" style="width:450px">
 							<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
 						</el-form-item>
                     </el-col>

From 9c4afabb1b8c41fb417bd06d174d35c6df3a3f12 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 10:24:45 +0800
Subject: [PATCH 04/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E7=8F=AD=E6=AC=A1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/shifts/index.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/shifts/index.vue b/src/views/wms/shifts/index.vue
index 0d521ed..3671e10 100644
--- a/src/views/wms/shifts/index.vue
+++ b/src/views/wms/shifts/index.vue
@@ -121,13 +121,13 @@
 		<!-- 添加或修改班次管理对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
-				<el-form-item label="班次编码" prop="shiftCode">
+				<el-form-item label="班次编码" prop="shiftCode" style="width:400px">
 					<el-input v-model="form.shiftCode" placeholder="请输入班次编码" />
 				</el-form-item>
-				<el-form-item label="班次名称" prop="shiftDescGlobal">
+				<el-form-item label="班次名称" prop="shiftDescGlobal" style="width:400px">
 					<el-input v-model="form.shiftDescGlobal" placeholder="请输入班次名称" />
 				</el-form-item>
-				<el-form-item label="开始时间" prop="shiftStartTime">
+				<el-form-item label="开始时间" prop="shiftStartTime" style="width:400px">
         	<el-time-select
             v-model="form.shiftStartTime"
             :picker-options="{
@@ -135,10 +135,10 @@
               step: '01:00',
               end: '23:00'
             }"
-            placeholder="选择班次开始时间">
+            placeholder="选择班次开始时间" style="width:300px">
           </el-time-select>
         </el-form-item>
-        <el-form-item label="结束时间" prop="shiftEndTime">
+        <el-form-item label="结束时间" prop="shiftEndTime" >
           <el-time-select
             v-model="form.shiftEndTime"
               :picker-options="{
@@ -146,11 +146,11 @@
               step: '01:00',
               end: '23:00'
             }"
-            placeholder="选择班次结束时间">
+            placeholder="选择班次结束时间" style="width:300px">
           </el-time-select>
         </el-form-item>
         <el-form-item label="是否启用" prop="active">
-          <el-select v-model="form.active" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
+          <el-select v-model="form.active" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:300px">
             <el-option v-for="item in options" :key="item.active" :label="item.label" :value="item.active"></el-option>
           </el-select>
         </el-form-item>

From 804385faca675fc9a03b84f3b3123a78249b5767 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 10:34:04 +0800
Subject: [PATCH 05/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/supplier/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/supplier/index.vue b/src/views/wms/supplier/index.vue
index e0170dd..f48e4dd 100644
--- a/src/views/wms/supplier/index.vue
+++ b/src/views/wms/supplier/index.vue
@@ -349,7 +349,7 @@
 				<el-row :gutter="10" class="mb8">
                   	<el-col :span="12">
 						<el-form-item label="是否启用" prop="activeFlag">
-                			<el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
+                			<el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:365px">
            						<el-option v-for="item in options" :key="item.activeFlag" :label="item.label" :value="item.activeFlag"></el-option>
           					</el-select>
         				</el-form-item>

From 359a21d5636dc842e06dbbf2eedd1aefd5f92f04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E6=99=93=E7=A3=8A?= <pangxiaolei@kehaida.com>
Date: Wed, 30 Aug 2023 11:33:45 +0800
Subject: [PATCH 06/23] =?UTF-8?q?wms-=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/odsRawOrderIn.js            |  44 ++
 src/api/wms/wmsRawOrderInSn.js          |  44 ++
 src/views/wms/embryo/index.vue          |  77 +---
 src/views/wms/odsRawOrderIn/index.vue   | 562 ++++++++++++++++++++++++
 src/views/wms/outorder/index.vue        |  13 +-
 src/views/wms/wmsEmbryoin/index.vue     |  46 +-
 src/views/wms/wmsRawOrderInSn/index.vue | 440 +++++++++++++++++++
 7 files changed, 1113 insertions(+), 113 deletions(-)
 create mode 100644 src/api/wms/odsRawOrderIn.js
 create mode 100644 src/api/wms/wmsRawOrderInSn.js
 create mode 100644 src/views/wms/odsRawOrderIn/index.vue
 create mode 100644 src/views/wms/wmsRawOrderInSn/index.vue

diff --git a/src/api/wms/odsRawOrderIn.js b/src/api/wms/odsRawOrderIn.js
new file mode 100644
index 0000000..d81a5bc
--- /dev/null
+++ b/src/api/wms/odsRawOrderIn.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询包材到货单列表
+export function listOdsRawOrderIn(query) {
+	return request({
+		url: '/wms/odsRawOrderIn/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询包材到货单详细
+export function getOdsRawOrderIn(rawOrderInId) {
+	return request({
+		url: '/wms/odsRawOrderIn/' + rawOrderInId,
+		method: 'get'
+		});
+}
+
+// 新增包材到货单
+export function addOdsRawOrderIn(data) {
+	return request({
+		url: '/wms/odsRawOrderIn',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改包材到货单
+export function updateOdsRawOrderIn(data) {
+	return request({
+		url: '/wms/odsRawOrderIn',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除包材到货单
+export function delOdsRawOrderIn(rawOrderInId) {
+	return request({
+		url: '/wms/odsRawOrderIn/' + rawOrderInId,
+		method: 'delete'
+	});
+}
diff --git a/src/api/wms/wmsRawOrderInSn.js b/src/api/wms/wmsRawOrderInSn.js
new file mode 100644
index 0000000..c83ae61
--- /dev/null
+++ b/src/api/wms/wmsRawOrderInSn.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询原材料收货明细列表
+export function listWmsRawOrderInSn(query) {
+	return request({
+		url: '/wms/wmsRawOrderInSn/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询原材料收货明细详细
+export function getWmsRawOrderInSn(rawOrderInSnId) {
+	return request({
+		url: '/wms/wmsRawOrderInSn/' + rawOrderInSnId,
+		method: 'get'
+		});
+}
+
+// 新增原材料收货明细
+export function addWmsRawOrderInSn(data) {
+	return request({
+		url: '/wms/wmsRawOrderInSn',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改原材料收货明细
+export function updateWmsRawOrderInSn(data) {
+	return request({
+		url: '/wms/wmsRawOrderInSn',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除原材料收货明细
+export function delWmsRawOrderInSn(rawOrderInSnId) {
+	return request({
+		url: '/wms/wmsRawOrderInSn/' + rawOrderInSnId,
+		method: 'delete'
+	});
+}
diff --git a/src/views/wms/embryo/index.vue b/src/views/wms/embryo/index.vue
index 57cad4b..9e8f5c3 100644
--- a/src/views/wms/embryo/index.vue
+++ b/src/views/wms/embryo/index.vue
@@ -87,19 +87,20 @@
 			<el-table-column label="出库单号" align="center" prop="orderCode" />
 			<el-table-column label="型号编码" align="center" prop="materialCode" />
 			<el-table-column label="型号名称" align="center" prop="materialDesc" />
-			<el-table-column label="计划日期" align="center" prop="planDate" width="180" v-if="false" >
+			<el-table-column label="日期" align="center" prop="planDate" width="180" v-if="false" >
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="计划数量" align="center" prop="planNumber" />
+		
 			<el-table-column label="单位" align="center" prop="Unit"  v-if="false" />
-			<el-table-column label="已出库数量" align="center" prop="realityNumber" />
-			<el-table-column label="订单状态" align="center" prop="orderStatus" />
+			<el-table-column label="出库数量" align="center" prop="realityNumber" />
+			<el-table-column label="状态" align="center" prop="orderStatus" />
 			<el-table-column label="批次号" align="center" prop="userDefined1" />
+			<el-table-column label="库位" align="center" prop="locCode" />
 			<el-table-column label="产线" align="center" prop="productionLineDesc" />
 			<el-table-column label="产线编号" align="center" prop="productionLineCode"  v-if="false" />
-			<el-table-column label="库位" align="center" prop="locCode" />
+			
 
 			<el-table-column label="备注" align="center" prop="Remark" />
 			<el-table-column label="创建人" align="center" prop="createBy" />
@@ -181,73 +182,11 @@
 				<el-form-item label="库位" prop="locCode">
 					<el-input v-model="form.locCode" placeholder="请输入库位" />
 				</el-form-item>
-				<el-form-item label="用户自定义属性2" prop="userDefined2">
-					<el-input v-model="form.userDefined2" placeholder="请输入用户自定义属性2" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性3" prop="userDefined3">
-					<el-input v-model="form.userDefined3" placeholder="请输入用户自定义属性3" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性4" prop="userDefined4">
-					<el-input v-model="form.userDefined4" placeholder="请输入用户自定义属性4" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性5" prop="userDefined5">
-					<el-input v-model="form.userDefined5" placeholder="请输入用户自定义属性5" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性6" prop="userDefined6">
-					<el-input v-model="form.userDefined6" placeholder="请输入用户自定义属性6" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性7" prop="userDefined7">
-					<el-input v-model="form.userDefined7" placeholder="请输入用户自定义属性7" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性8" prop="userDefined8">
-					<el-input v-model="form.userDefined8" placeholder="请输入用户自定义属性8" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性9" prop="userDefined9">
-					<el-input v-model="form.userDefined9" placeholder="请输入用户自定义属性9" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性10" prop="userDefined10">
-					<el-input v-model="form.userDefined10" placeholder="请输入用户自定义属性10" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性11" prop="userDefined11">
-					<el-input v-model="form.userDefined11" placeholder="请输入用户自定义属性11" />
-				</el-form-item>
-				<el-form-item label="供应商编码" prop="supplierCode">
-					<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" />
-				</el-form-item>
-				<el-form-item label="供应商名称" prop="supplierName">
-					<el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
-				</el-form-item>
+				
 				<el-form-item label="备注" prop="Remark">
 					<el-input v-model="form.Remark" placeholder="请输入备注" />
 				</el-form-item>
-				<el-form-item label="创建时间" prop="createDate">
-					<el-date-picker clearable
-						v-model="form.createDate"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择创建时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="最后更新人" prop="lastUpdateBy">
-					<el-input v-model="form.lastUpdateBy" placeholder="请输入最后更新人" />
-				</el-form-item>
-				<el-form-item label="最后更新时间" prop="lastUpdateDate">
-					<el-date-picker clearable
-						v-model="form.lastUpdateDate"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择最后更新时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="可用标识" prop="Active">
-					<el-input v-model="form.Active" placeholder="请输入可用标识" />
-				</el-form-item>
-				<el-form-item label="企业主键" prop="enterpriseId">
-					<el-input v-model="form.enterpriseId" placeholder="请输入企业主键" />
-				</el-form-item>
-				<el-form-item label="企业编码" prop="enterpriseCode">
-					<el-input v-model="form.enterpriseCode" placeholder="请输入企业编码" />
-				</el-form-item>
+				
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/src/views/wms/odsRawOrderIn/index.vue b/src/views/wms/odsRawOrderIn/index.vue
new file mode 100644
index 0000000..56f225d
--- /dev/null
+++ b/src/views/wms/odsRawOrderIn/index.vue
@@ -0,0 +1,562 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
+			
+			<el-form-item label="到货单号" prop="dnNo">
+				<el-input
+					v-model="queryParams.dnNo"
+					placeholder="请输入到货单号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="采购单号" prop="poNo" width="180">
+				<el-input
+					v-model="queryParams.poNo"
+					placeholder="请输入采购订单号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			
+			<el-form-item label="物料编码" prop="materialCode">
+				<el-input
+					v-model="queryParams.materialCode"
+					placeholder="请输入物料号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="物料描述" prop="materialDesc">
+				<el-input
+					v-model="queryParams.materialDesc"
+					placeholder="请输入物料描述"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			
+			<el-form-item label="供应商编码" prop="supplyCode" width="180">
+				<el-input
+					v-model="queryParams.supplyCode"
+					placeholder="请输入供应商编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			
+			<el-form-item>
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="primary"
+					plain
+					icon="el-icon-plus"
+					size="mini"
+					@click="handleAdd"
+					v-hasPermi="['wms:odsRawOrderIn:add']"
+				>新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="success"
+					plain
+					icon="el-icon-edit"
+					size="mini"
+					:disabled="single"
+					@click="handleUpdate"
+					v-hasPermi="['wms:odsRawOrderIn:edit']"
+				>修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="multiple"
+					@click="handleDelete"
+					v-hasPermi="['wms:odsRawOrderIn:remove']"
+				>删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['wms:odsRawOrderIn:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="odsRawOrderInList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="到货单号" align="center" prop="dnNo" />
+			<el-table-column label="采购订单号" align="center" prop="poNo" width="180"/>
+			<el-table-column label="采购行号" align="center" prop="poLine" />
+			<el-table-column label="物料号" align="center" prop="materialCode" />
+			<el-table-column label="物料描述" align="center" prop="materialDesc" />
+			<el-table-column label="单位" align="center" prop="unit" />
+			<el-table-column label="供应商编码" align="center" prop="supplyCode" width="180"/>
+			<el-table-column label="订单数量" align="center" prop="requestAmount" />
+			<el-table-column label="收货数量" align="center" prop="receiptAmount" />
+			<el-table-column label="备品数量" align="center" prop="shelvesAmount" />
+			<el-table-column label="单据状态" align="center" prop="orderStatus" />
+			
+			<el-table-column label="质检状态" align="center" prop="qualityStatus" />
+			<el-table-column label="收货人" align="center" prop="receiptOperator" />
+			<el-table-column label="收货时间" align="center" prop="receiptTime" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.receiptTime, '{y}-{m}-{d}') }}</span>
+				</template>
+			</el-table-column>
+	
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['wms:odsRawOrderIn:edit']"
+					>修改</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['wms:odsRawOrderIn:remove']"
+					>删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+
+		<!-- 添加或修改包材到货单对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="工厂编码" prop="factoryCode">
+					<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
+				</el-form-item>
+				<el-form-item label="仓库编码" prop="whCode">
+					<el-input v-model="form.whCode" placeholder="请输入仓库编码" />
+				</el-form-item>
+				<el-form-item label="库区编码" prop="waCode">
+					<el-input v-model="form.waCode" placeholder="请输入库区编码" />
+				</el-form-item>
+				<el-form-item label="库位编码" prop="wlCode">
+					<el-input v-model="form.wlCode" placeholder="请输入库位编码" />
+				</el-form-item>
+				<el-form-item label="入库单号" prop="orderNo">
+					<el-input v-model="form.orderNo" placeholder="请输入入库单号" />
+				</el-form-item>
+				<el-form-item label="DN单号" prop="dnNo">
+					<el-input v-model="form.dnNo" placeholder="请输入DN单号" />
+				</el-form-item>
+				<el-form-item label="采购订单号" prop="poNo">
+					<el-input v-model="form.poNo" placeholder="请输入采购订单号" />
+				</el-form-item>
+				<el-form-item label="采购订单行号" prop="poLine">
+					<el-input v-model="form.poLine" placeholder="请输入采购订单行号" />
+				</el-form-item>
+				<el-form-item label="物料号" prop="materialCode">
+					<el-input v-model="form.materialCode" placeholder="请输入物料号" />
+				</el-form-item>
+				<el-form-item label="物料描述" prop="materialDesc">
+					<el-input v-model="form.materialDesc" placeholder="请输入物料描述" />
+				</el-form-item>
+				<el-form-item label="单位" prop="unit">
+					<el-input v-model="form.unit" placeholder="请输入单位" />
+				</el-form-item>
+				<el-form-item label="采购组" prop="buyerGroup">
+					<el-input v-model="form.buyerGroup" placeholder="请输入采购组" />
+				</el-form-item>
+				<el-form-item label="供应商编码" prop="supplyCode">
+					<el-input v-model="form.supplyCode" placeholder="请输入供应商编码" />
+				</el-form-item>
+				<el-form-item label="工厂" prop="sapFactoryCode">
+					<el-input v-model="form.sapFactoryCode" placeholder="请输入工厂" />
+				</el-form-item>
+				<el-form-item label="交货地点" prop="sendSpot">
+					<el-input v-model="form.sendSpot" placeholder="请输入交货地点" />
+				</el-form-item>
+				<el-form-item label="需求数量" prop="requestAmount">
+					<el-input v-model="form.requestAmount" placeholder="请输入需求数量" />
+				</el-form-item>
+				<el-form-item label="收货数量" prop="receiptAmount">
+					<el-input v-model="form.receiptAmount" placeholder="请输入收货数量" />
+				</el-form-item>
+				<el-form-item label="备品数量" prop="shelvesAmount">
+					<el-input v-model="form.shelvesAmount" placeholder="请输入备品数量" />
+				</el-form-item>
+				<el-form-item label="库存地点" prop="location">
+					<el-input v-model="form.location" placeholder="请输入库存地点" />
+				</el-form-item>
+				<el-form-item label="需求时间" prop="requestTime">
+					<el-date-picker clearable
+						v-model="form.requestTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择需求时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="收货人" prop="receiptOperator">
+					<el-input v-model="form.receiptOperator" placeholder="请输入收货操作人" />
+				</el-form-item>
+				<el-form-item label="收货时间" prop="receiptTime">
+					<el-date-picker clearable
+						v-model="form.receiptTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择收货时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="上架操作人" prop="shelvesOperator">
+					<el-input v-model="form.shelvesOperator" placeholder="请输入上架操作人" />
+				</el-form-item>
+				<el-form-item label="退货数量" prop="returnAmount">
+					<el-input v-model="form.returnAmount" placeholder="请输入退货数量" />
+				</el-form-item>
+				<el-form-item label="退料人" prop="returnName">
+					<el-input v-model="form.returnName" placeholder="请输入退料人" />
+				</el-form-item>
+				<el-form-item label="退货过账时间" prop="returnTime">
+					<el-date-picker clearable
+						v-model="form.returnTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择退货过账时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="上架时间" prop="shelvesTime">
+					<el-date-picker clearable
+						v-model="form.shelvesTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择上架时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="退货过账信息" prop="returnMessage">
+					<el-input v-model="form.returnMessage" placeholder="请输入退货过账信息" />
+				</el-form-item>
+				<el-form-item label="收货过账时间" prop="accountingTime">
+					<el-date-picker clearable
+						v-model="form.accountingTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择收货过账时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="收货过账信息" prop="accountingMessage">
+					<el-input v-model="form.accountingMessage" placeholder="请输入收货过账信息" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined1">
+					<el-input v-model="form.userDefined1" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined2">
+					<el-input v-model="form.userDefined2" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined3">
+					<el-input v-model="form.userDefined3" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined4">
+					<el-input v-model="form.userDefined4" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined5">
+					<el-input v-model="form.userDefined5" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined6">
+					<el-input v-model="form.userDefined6" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined7">
+					<el-input v-model="form.userDefined7" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined8">
+					<el-input v-model="form.userDefined8" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用9" prop="userDefined9">
+					<el-input v-model="form.userDefined9" placeholder="请输入备用9" />
+				</el-form-item>
+				<el-form-item label="备用10" prop="userDefined10">
+					<el-input v-model="form.userDefined10" placeholder="请输入备用10" />
+				</el-form-item>
+				<el-form-item label="创建时间" prop="gmtCreate">
+					<el-date-picker clearable
+						v-model="form.gmtCreate"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择创建时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="最后更新人" prop="lastModifiedBy">
+					<el-input v-model="form.lastModifiedBy" placeholder="请输入最后更新人" />
+				</el-form-item>
+				<el-form-item label="最后更新时间" prop="gmtModified">
+					<el-date-picker clearable
+						v-model="form.gmtModified"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择最后更新时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="有效标记" prop="activeFlag">
+					<el-input v-model="form.activeFlag" placeholder="请输入有效标记" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import { listOdsRawOrderIn, getOdsRawOrderIn, delOdsRawOrderIn, addOdsRawOrderIn, updateOdsRawOrderIn } from "@/api/wms/odsRawOrderIn";
+
+export default {
+	name: "OdsRawOrderIn",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 包材到货单表格数据
+			odsRawOrderInList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				factoryCode: null,
+				whCode: null,
+				waCode: null,
+				wlCode: null,
+				orderInType: null,
+				orderNo: null,
+				dnNo: null,
+				poNo: null,
+				poLine: null,
+				poType: null,
+				materialCode: null,
+				materialDesc: null,
+				unit: null,
+				buyerGroup: null,
+				supplyCode: null,
+				sapFactoryCode: null,
+				sendSpot: null,
+				requestAmount: null,
+				receiptAmount: null,
+				shelvesAmount: null,
+				location: null,
+				requestTime: null,
+				qualityStatus: null,
+				orderStatus: null,
+				receiptOperator: null,
+				receiptTime: null,
+				shelvesOperator: null,
+				returnAmount: null,
+				returnName: null,
+				returnTime: null,
+				returnStatus: null,
+				shelvesTime: null,
+				returnMessage: null,
+				accountingStatus: null,
+				accountingTime: null,
+				accountingMessage: null,
+				userDefined1: null,
+				userDefined2: null,
+				userDefined3: null,
+				userDefined4: null,
+				userDefined5: null,
+				userDefined6: null,
+				userDefined7: null,
+				userDefined8: null,
+				userDefined9: null,
+				userDefined10: null,
+				gmtCreate: null,
+				lastModifiedBy: null,
+				gmtModified: null,
+				activeFlag: null
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 查询包材到货单列表 */
+		getList() {
+			this.loading = true;
+			listOdsRawOrderIn(this.queryParams).then(response => {
+				this.odsRawOrderInList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				rawOrderInId: null,
+				factoryCode: null,
+				whCode: null,
+				waCode: null,
+				wlCode: null,
+				orderInType: null,
+				orderNo: null,
+				dnNo: null,
+				poNo: null,
+				poLine: null,
+				poType: null,
+				materialCode: null,
+				materialDesc: null,
+				unit: null,
+				buyerGroup: null,
+				supplyCode: null,
+				sapFactoryCode: null,
+				sendSpot: null,
+				requestAmount: null,
+				receiptAmount: null,
+				shelvesAmount: null,
+				location: null,
+				requestTime: null,
+				qualityStatus: null,
+				orderStatus: null,
+				receiptOperator: null,
+				receiptTime: null,
+				shelvesOperator: null,
+				returnAmount: null,
+				returnName: null,
+				returnTime: null,
+				returnStatus: null,
+				shelvesTime: null,
+				returnMessage: null,
+				accountingStatus: null,
+				accountingTime: null,
+				accountingMessage: null,
+				userDefined1: null,
+				userDefined2: null,
+				userDefined3: null,
+				userDefined4: null,
+				userDefined5: null,
+				userDefined6: null,
+				userDefined7: null,
+				userDefined8: null,
+				userDefined9: null,
+				userDefined10: null,
+				createBy: null,
+				gmtCreate: null,
+				lastModifiedBy: null,
+				gmtModified: null,
+				activeFlag: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.rawOrderInId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加包材到货单";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const rawOrderInId = row.rawOrderInId || this.ids
+			getOdsRawOrderIn(rawOrderInId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改包材到货单";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.rawOrderInId != null) {
+						updateOdsRawOrderIn(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addOdsRawOrderIn(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const rawOrderInIds = row.rawOrderInId || this.ids;
+			this.$modal.confirm('是否确认删除包材到货单编号为"' + rawOrderInIds + '"的数据项？').then(function() {
+				return delOdsRawOrderIn(rawOrderInIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('wms/odsRawOrderIn/export', {
+				...this.queryParams
+			}, `odsRawOrderIn_${new Date().getTime()}.xlsx`)
+		}
+	}
+};
+</script>
diff --git a/src/views/wms/outorder/index.vue b/src/views/wms/outorder/index.vue
index 9b6c947..77145b7 100644
--- a/src/views/wms/outorder/index.vue
+++ b/src/views/wms/outorder/index.vue
@@ -84,7 +84,7 @@
       <el-table-column label="序号" type="index"   :index='indexMethod'> </el-table-column>
 			<el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" />
 			<el-table-column label="ID" align="center" prop="ID" v-if="false" />
-			<el-table-column label="生产订单" align="center" prop="produceCode" />
+			<el-table-column label="出库单号" align="center" prop="produceCode" />
 			<el-table-column label="型号编码" align="center" prop="materialCode" />
 			<el-table-column label="型号名称" align="center" prop="materialDesc" />
       <el-table-column label="批次号" align="center" prop="userDefined1" />
@@ -93,18 +93,19 @@
 					<span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="计划数量" align="center" prop="planNumber" />
+			
 			<el-table-column label="单位" align="center" prop="Unit" v-if="false" />
-			<el-table-column label="已出库数量" align="center" prop="outNumber" />
+			<el-table-column label="出库数量" align="center" prop="outNumber" />
+			<el-table-column label="托盘号" align="center" prop="palletCode" />
 			<el-table-column label="库位" align="center" prop="locCode" />
 			<el-table-column label="库位名称" align="center" prop="locDesc"v-if="false" />
 			<el-table-column label="产线名称" align="center" prop="productionLineDesc" v-if="false" />
 			<el-table-column label="产线" align="center" prop="productionLineCode" />
-			<el-table-column label="订单状态" align="center" prop="orderStatus" />
+			<el-table-column label="状态" align="center" prop="orderStatus" />
 
 
-			<el-table-column label="创建人" align="center" prop="createBy" />
-			<el-table-column label="创建时间" align="center" prop="createDate" width="180">
+			<el-table-column label="操作人" align="center" prop="createBy" />
+			<el-table-column label="操作时间" align="center" prop="createDate" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d}') }}</span>
 				</template>
diff --git a/src/views/wms/wmsEmbryoin/index.vue b/src/views/wms/wmsEmbryoin/index.vue
index 7be8836..9ce9612 100644
--- a/src/views/wms/wmsEmbryoin/index.vue
+++ b/src/views/wms/wmsEmbryoin/index.vue
@@ -38,7 +38,7 @@
 		</el-form>
 
 		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
+			<!-- <el-col :span="1.5">
 				<el-button
 					type="primary"
 					plain
@@ -69,7 +69,7 @@
 					@click="handleDelete"
 					v-hasPermi="['wms:wmsEmbryoin:remove']"
 				>删除</el-button>
-			</el-col>
+			</el-col> -->
 			<el-col :span="1.5">
 				<el-button
 					type="warning"
@@ -86,35 +86,22 @@
 		<el-table v-loading="loading" :data="wmsEmbryoinList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="工厂编码" align="center" prop="siteCode" />
-			<el-table-column label="ID" align="center" prop="ID" />
 			<el-table-column label="入库单号" align="center" prop="orderCode" />
 			<el-table-column label="型号编码" align="center" prop="materialCode" />
 			<el-table-column label="型号名称" align="center" prop="materialDesc" />
-			<el-table-column label="计划日期" align="center" prop="planDate" width="180">
+			<el-table-column label="日期" align="center" prop="planDate" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="计划数量" align="center" prop="planNumber" />
 			<el-table-column label="单位" align="center" prop="Unit" />
-			<el-table-column label="已出库数量" align="center" prop="realityNumber" />
-			<el-table-column label="订单状态" align="center" prop="orderStatus" />
+			<el-table-column label="数量" align="center" prop="realityNumber" />
+			<el-table-column label="状态" align="center" prop="orderStatus" />
 			<el-table-column label="批次号" align="center" prop="userDefined1" />
 			<el-table-column label="产线名称" align="center" prop="productionLineDesc" />
 			<el-table-column label="产线编号" align="center" prop="productionLineCode" />
 			<el-table-column label="库位" align="center" prop="locCode" />
-			<el-table-column label="用户自定义属性2" align="center" prop="userDefined2" />
-			<el-table-column label="用户自定义属性3" align="center" prop="userDefined3" />
-			<el-table-column label="用户自定义属性4" align="center" prop="userDefined4" />
-			<el-table-column label="用户自定义属性5" align="center" prop="userDefined5" />
-			<el-table-column label="用户自定义属性6" align="center" prop="userDefined6" />
-			<el-table-column label="用户自定义属性7" align="center" prop="userDefined7" />
-			<el-table-column label="用户自定义属性8" align="center" prop="userDefined8" />
-			<el-table-column label="用户自定义属性9" align="center" prop="userDefined9" />
-			<el-table-column label="用户自定义属性10" align="center" prop="userDefined10" />
-			<el-table-column label="用户自定义属性11" align="center" prop="userDefined11" />
-			<el-table-column label="供应商编码" align="center" prop="supplierCode" />
-			<el-table-column label="供应商名称" align="center" prop="supplierName" />
+			
 			<el-table-column label="备注" align="center" prop="Remark" />
 			<el-table-column label="创建人" align="center" prop="createBy" />
 			<el-table-column label="创建时间" align="center" prop="createDate" width="180">
@@ -128,26 +115,9 @@
 					<span>{{ parseTime(scope.row.lastUpdateDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="可用标识" align="center" prop="Active" />
-			<el-table-column label="企业主键" align="center" prop="enterpriseId" />
-			<el-table-column label="企业编码" align="center" prop="enterpriseCode" />
+			
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['wms:wmsEmbryoin:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:wmsEmbryoin:remove']"
-					>删除</el-button>
-				</template>
+				
 			</el-table-column>
 		</el-table>
 
diff --git a/src/views/wms/wmsRawOrderInSn/index.vue b/src/views/wms/wmsRawOrderInSn/index.vue
new file mode 100644
index 0000000..dd50620
--- /dev/null
+++ b/src/views/wms/wmsRawOrderInSn/index.vue
@@ -0,0 +1,440 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
+			
+			<el-form-item label="库位编码" prop="wlCode">
+				<el-input
+					v-model="queryParams.wlCode"
+					placeholder="请输入库位编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="到货单号" prop="orderNo">
+				<el-input
+					v-model="queryParams.orderNo"
+					placeholder="请输入到货单号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="采购单号" prop="poNo">
+				<el-input
+					v-model="queryParams.poNo"
+					placeholder="请输入采购订单号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			
+			<el-form-item label="物料号" prop="materialCode">
+				<el-input
+					v-model="queryParams.materialCode"
+					placeholder="请输入物料号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="物料描述" prop="materialDesc">
+				<el-input
+					v-model="queryParams.materialDesc"
+					placeholder="请输入物料描述"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="托盘号" prop="sn">
+				<el-input
+					v-model="queryParams.sn"
+					placeholder="请输入托盘号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			
+			<el-form-item>
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<!-- <el-col :span="1.5">
+				<el-button
+					type="primary"
+					plain
+					icon="el-icon-plus"
+					size="mini"
+					@click="handleAdd"
+					v-hasPermi="['wms:wmsRawOrderInSn:add']"
+				>新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="success"
+					plain
+					icon="el-icon-edit"
+					size="mini"
+					:disabled="single"
+					@click="handleUpdate"
+					v-hasPermi="['wms:wmsRawOrderInSn:edit']"
+				>修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="multiple"
+					@click="handleDelete"
+					v-hasPermi="['wms:wmsRawOrderInSn:remove']"
+				>删除</el-button>
+			</el-col> -->
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['wms:wmsRawOrderInSn:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="wmsRawOrderInSnList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			
+			<el-table-column label="仓库编码" align="center" prop="whCode" />
+			
+			<el-table-column label="库位编码" align="center" prop="wlCode" />
+			<el-table-column label="到货单号" align="center" prop="orderNo" />
+			<el-table-column label="采购单号" align="center" prop="poNo" />
+			<el-table-column label="采购行号" align="center" prop="poLine" />
+			<el-table-column label="物料号" align="center" prop="materialCode" />
+			<el-table-column label="物料描述" align="center" prop="materialDesc" />
+			<el-table-column label="托盘号" align="center" prop="sn" />
+			<el-table-column label="数量" align="center" prop="amount" />
+			
+			<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>
+				</template>
+			</el-table-column>
+			
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['wms:wmsRawOrderInSn:edit']"
+					>修改</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['wms:wmsRawOrderInSn:remove']"
+					>删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+
+		<!-- 添加或修改原材料收货明细对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="仓库编码" prop="whCode">
+					<el-input v-model="form.whCode" placeholder="请输入仓库编码" />
+				</el-form-item>
+				<el-form-item label="库区编码" prop="waCode">
+					<el-input v-model="form.waCode" placeholder="请输入库区编码" />
+				</el-form-item>
+				<el-form-item label="库位编码" prop="wlCode">
+					<el-input v-model="form.wlCode" placeholder="请输入库位编码" />
+				</el-form-item>
+				<el-form-item label="入库单号" prop="orderNo">
+					<el-input v-model="form.orderNo" placeholder="请输入入库单号" />
+				</el-form-item>
+				<el-form-item label="采购订单号" prop="poNo">
+					<el-input v-model="form.poNo" placeholder="请输入采购订单号" />
+				</el-form-item>
+				<el-form-item label="采购订单行项目" prop="poLine">
+					<el-input v-model="form.poLine" placeholder="请输入采购订单行项目" />
+				</el-form-item>
+				<el-form-item label="物料号" prop="materialCode">
+					<el-input v-model="form.materialCode" placeholder="请输入物料号" />
+				</el-form-item>
+				<el-form-item label="物料描述" prop="materialDesc">
+					<el-input v-model="form.materialDesc" placeholder="请输入物料描述" />
+				</el-form-item>
+				<el-form-item label="托盘号" prop="sn">
+					<el-input v-model="form.sn" placeholder="请输入托盘号" />
+				</el-form-item>
+				<el-form-item label="数量" prop="amount">
+					<el-input v-model="form.amount" placeholder="请输入数量" />
+				</el-form-item>
+				<el-form-item label="备用1" prop="userDefined1">
+					<el-input v-model="form.userDefined1" placeholder="请输入备用1" />
+				</el-form-item>
+				<el-form-item label="备用2" prop="userDefined2">
+					<el-input v-model="form.userDefined2" placeholder="请输入备用2" />
+				</el-form-item>
+				<el-form-item label="备用3" prop="userDefined3">
+					<el-input v-model="form.userDefined3" placeholder="请输入备用3" />
+				</el-form-item>
+				<el-form-item label="备用4" prop="userDefined4">
+					<el-input v-model="form.userDefined4" placeholder="请输入备用4" />
+				</el-form-item>
+				<el-form-item label="备用5" prop="userDefined5">
+					<el-input v-model="form.userDefined5" placeholder="请输入备用5" />
+				</el-form-item>
+				<el-form-item label="备用6" prop="userDefined6">
+					<el-input v-model="form.userDefined6" placeholder="请输入备用6" />
+				</el-form-item>
+				<el-form-item label="备用7" prop="userDefined7">
+					<el-input v-model="form.userDefined7" placeholder="请输入备用7" />
+				</el-form-item>
+				<el-form-item label="备用8" prop="userDefined8">
+					<el-input v-model="form.userDefined8" placeholder="请输入备用8" />
+				</el-form-item>
+				<el-form-item label="备用9" prop="userDefined9">
+					<el-input v-model="form.userDefined9" placeholder="请输入备用9" />
+				</el-form-item>
+				<el-form-item label="备用10" prop="userDefined10">
+					<el-input v-model="form.userDefined10" placeholder="请输入备用10" />
+				</el-form-item>
+				<el-form-item label="创建时间" prop="gmtCreate">
+					<el-date-picker clearable
+						v-model="form.gmtCreate"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择创建时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="最后更新人" prop="lastModifiedBy">
+					<el-input v-model="form.lastModifiedBy" placeholder="请输入最后更新人" />
+				</el-form-item>
+				<el-form-item label="最后更新时间" prop="gmtModified">
+					<el-date-picker clearable
+						v-model="form.gmtModified"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择最后更新时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="有效标记" prop="activeFlag">
+					<el-input v-model="form.activeFlag" placeholder="请输入有效标记" />
+				</el-form-item>
+				<el-form-item label="${comment}" prop="factoryCode">
+					<el-input v-model="form.factoryCode" placeholder="请输入${comment}" />
+				</el-form-item>
+				<el-form-item label="${comment}" prop="sapFactoryCode">
+					<el-input v-model="form.sapFactoryCode" placeholder="请输入${comment}" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import { listWmsRawOrderInSn, getWmsRawOrderInSn, delWmsRawOrderInSn, addWmsRawOrderInSn, updateWmsRawOrderInSn } from "@/api/wms/wmsRawOrderInSn";
+
+export default {
+	name: "WmsRawOrderInSn",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 原材料收货明细表格数据
+			wmsRawOrderInSnList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				whCode: null,
+				waCode: null,
+				wlCode: null,
+				orderNo: null,
+				poNo: null,
+				poLine: null,
+				materialCode: null,
+				materialDesc: null,
+				sn: null,
+				amount: null,
+				userDefined1: null,
+				userDefined2: null,
+				userDefined3: null,
+				userDefined4: null,
+				userDefined5: null,
+				userDefined6: null,
+				userDefined7: null,
+				userDefined8: null,
+				userDefined9: null,
+				userDefined10: null,
+				gmtCreate: null,
+				lastModifiedBy: null,
+				gmtModified: null,
+				activeFlag: null,
+				factoryCode: null,
+				sapFactoryCode: null
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 查询原材料收货明细列表 */
+		getList() {
+			this.loading = true;
+			listWmsRawOrderInSn(this.queryParams).then(response => {
+				this.wmsRawOrderInSnList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				rawOrderInSnId: null,
+				whCode: null,
+				waCode: null,
+				wlCode: null,
+				orderNo: null,
+				poNo: null,
+				poLine: null,
+				materialCode: null,
+				materialDesc: null,
+				sn: null,
+				amount: null,
+				userDefined1: null,
+				userDefined2: null,
+				userDefined3: null,
+				userDefined4: null,
+				userDefined5: null,
+				userDefined6: null,
+				userDefined7: null,
+				userDefined8: null,
+				userDefined9: null,
+				userDefined10: null,
+				createBy: null,
+				gmtCreate: null,
+				lastModifiedBy: null,
+				gmtModified: null,
+				activeFlag: null,
+				factoryCode: null,
+				sapFactoryCode: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.rawOrderInSnId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加原材料收货明细";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const rawOrderInSnId = row.rawOrderInSnId || this.ids
+			getWmsRawOrderInSn(rawOrderInSnId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改原材料收货明细";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.rawOrderInSnId != null) {
+						updateWmsRawOrderInSn(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addWmsRawOrderInSn(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const rawOrderInSnIds = row.rawOrderInSnId || this.ids;
+			this.$modal.confirm('是否确认删除原材料收货明细编号为"' + rawOrderInSnIds + '"的数据项？').then(function() {
+				return delWmsRawOrderInSn(rawOrderInSnIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('wms/wmsRawOrderInSn/export', {
+				...this.queryParams
+			}, `wmsRawOrderInSn_${new Date().getTime()}.xlsx`)
+		}
+	}
+};
+</script>

From aa0674b76daae9d9f6299c65b35231f191e1de21 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 11:47:57 +0800
Subject: [PATCH 07/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E2=80=94=E2=80=94=E5=B7=A5=E5=8E=82=E5=BB=BA=E6=A8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/factory/index.vue | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/views/wms/factory/index.vue b/src/views/wms/factory/index.vue
index 9d534ba..c50f95a 100644
--- a/src/views/wms/factory/index.vue
+++ b/src/views/wms/factory/index.vue
@@ -1,18 +1,19 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			<el-form-item label="工厂名称" prop="factoryName">
+			<el-form-item label="组织名称" prop="factoryName">
 				<el-input
 					v-model="queryParams.factoryName"
-					placeholder="请输入工厂名称"
+					placeholder="请输入组织名称"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="工厂状态" prop="status">
+      </el-form-item>
+			<el-form-item label="启用状态" prop="status">
 				<el-input
 					v-model="queryParams.status"
-					placeholder="请输入工厂状态(1/0)"
+					placeholder="请输入启用状态(1/0)"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
@@ -57,8 +58,8 @@
 			:default-expand-all="isExpandAll"
 			:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
 		>
-			<el-table-column label="工厂名称" align="center" prop="factoryName" />
-			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
+			<el-table-column label="组织名称" align="center" prop="factoryName" />
+			<el-table-column label="组织编码" align="center" prop="factoryCode" />
 			<el-table-column label="创建人" align="center" prop="createBy" />
       		<el-table-column label="创建时间" align="center" prop="createTime" />
       		<el-table-column prop="status" label="是否启用" align="center" >
@@ -96,14 +97,14 @@
 		<!-- 添加或修改工厂模型对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-form-item label="父工厂名" prop="parentId" style="width:430px">
-					<treeselect v-model="form.parentId" :options="factoryOptions" :normalizer="normalizer" placeholder="请选择父工厂id" />
+				<el-form-item label="父组织名" prop="parentId" style="width:430px">
+					<treeselect v-model="form.parentId" :options="factoryOptions" :normalizer="normalizer" placeholder="请选择父组织id" />
 				</el-form-item>
-				<el-form-item label="工厂名称" prop="factoryName" style="width:430px">
-					<el-input v-model="form.factoryName" placeholder="请输入工厂名称" />
+				<el-form-item label="组织名称" prop="factoryName" style="width:430px">
+					<el-input v-model="form.factoryName" placeholder="请输入组织名称" />
 				</el-form-item>
-				<el-form-item label="工厂编码" prop="factoryCode" style="width:430px">
-        			<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
+				<el-form-item label="组织编码" prop="factoryCode" style="width:430px">
+        			<el-input v-model="form.factoryCode" placeholder="请输入组织编码" />
    				</el-form-item>
 				<el-form-item label="负责人" prop="leader" style="width:430px">
 					<el-input v-model="form.leader" placeholder="请输入负责人" />

From 5ecea24712287d70a200a94ee31eb140f36eb4ca Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 11:53:30 +0800
Subject: [PATCH 08/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/productGroups/index.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/productGroups/index.vue b/src/views/wms/productGroups/index.vue
index 0977ba2..64d3357 100644
--- a/src/views/wms/productGroups/index.vue
+++ b/src/views/wms/productGroups/index.vue
@@ -73,9 +73,9 @@
       </el-table-column>
 			<el-table-column label="创建人" align="center" prop="createBy" />
 			<el-table-column label="创建时间" align="center" prop="createTime" />
-			<el-table-column label="可用标识" align="center" prop="Active">
+			<el-table-column label="可用标识" align="center" prop="active">
 				<template slot-scope="scope">
-          			{{ scope.row.Active == 1 ? "是" : "否" }}
+          			{{ scope.row.active == 1 ? "是" : "否" }}
         		</template>
       		</el-table-column>
 			<!-- <el-table-column label="企业主键" align="center" prop="enterpriseId" />
@@ -114,13 +114,13 @@
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="110px">
 				<el-form-item label="物料类别编码" prop="pgCode">
-					<el-input v-model="form.pgCode" placeholder="请输入物料类别编码" />
+					<el-input v-model="form.pgCode" placeholder="请输入物料类别编码" style="width:300px"/>
 				</el-form-item>
 				<!-- <el-form-item label="产品分组简称" prop="pgDesc">
 					<el-input v-model="form.pgDesc" placeholder="请输入产品分组简称" />
 				</el-form-item> -->
 				<el-form-item label="物料类别名称" prop="pgDescGlobal">
-        	<el-select v-model="form.pgDescGlobal" placeholder="请选择物料类别名称">
+        	<el-select v-model="form.pgDescGlobal" placeholder="请选择物料类别名称" style="width:300px">
             <el-option
               v-for="dict in dict.type.material_type"
               :key="dict.value"
@@ -132,9 +132,9 @@
 				<!-- <el-form-item label="产品分组扩展名称" prop="pgDescExtended">
 					<el-input v-model="form.pgDescExtended" placeholder="请输入产品分组扩展名称" />
 				</el-form-item> -->
-				<el-form-item label="可用标识" prop="Active">
-				  <el-select v-model="form.Active" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
-            	  	<el-option v-for="item in options" :key="item.Active" :label="item.label" :value="item.Active"></el-option>
+				<el-form-item label="可用标识" prop="active">
+				  <el-select v-model="form.active" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:300px">
+            	  	<el-option v-for="item in options" :key="item.active" :label="item.label" :value="item.active"></el-option>
           		  </el-select>
 				</el-form-item>
 				<!-- <el-form-item label="企业主键" prop="enterpriseId">
@@ -192,17 +192,17 @@ export default {
 				pgDesc: null,
 				pgDescGlobal: null,
 				pgDescExtended: null,
-				Active: null,
+				active: null,
 				enterpriseId: null,
 				enterpriseCode: null,
 				siteId: null,
 				siteCode: null
 			},
 			options: [{
-        Active: "1",
+        active: "1",
         label: '是'
         }, {
-        Active: "0",
+        active: "0",
         label: '否'
       }],
 			// 表单参数
@@ -255,7 +255,7 @@ export default {
 				createTime: null,
 				updateBy: null,
 				updateTime: null,
-				Active: null,
+				active: null,
 				enterpriseId: null,
 				enterpriseCode: null,
 				siteId: null,

From 8b458c7e03a65e7a5106edfaeb88877d0401d7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E6=99=93=E7=A3=8A?= <pangxiaolei@kehaida.com>
Date: Wed, 30 Aug 2023 12:29:42 +0800
Subject: [PATCH 09/23] =?UTF-8?q?wms-=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/outorder/index.vue | 81 +++-----------------------------
 1 file changed, 6 insertions(+), 75 deletions(-)

diff --git a/src/views/wms/outorder/index.vue b/src/views/wms/outorder/index.vue
index 77145b7..e5e25a7 100644
--- a/src/views/wms/outorder/index.vue
+++ b/src/views/wms/outorder/index.vue
@@ -96,7 +96,7 @@
 			
 			<el-table-column label="单位" align="center" prop="Unit" v-if="false" />
 			<el-table-column label="出库数量" align="center" prop="outNumber" />
-			<el-table-column label="托盘号" align="center" prop="palletCode" />
+			<el-table-column label="托盘号" align="center" prop="userDefined2" />
 			<el-table-column label="库位" align="center" prop="locCode" />
 			<el-table-column label="库位名称" align="center" prop="locDesc"v-if="false" />
 			<el-table-column label="产线名称" align="center" prop="productionLineDesc" v-if="false" />
@@ -145,7 +145,7 @@
 				<el-form-item label="工厂编码" prop="siteCode">
 					<el-input v-model="form.siteCode" placeholder="请输入工厂编码" />
 				</el-form-item>
-				<el-form-item label="生成订单" prop="produceCode">
+				<el-form-item label="出库单号" prop="produceCode">
 					<el-input v-model="form.produceCode" placeholder="请输入生成订单" />
 				</el-form-item>
 				<el-form-item label="型号编码" prop="materialCode">
@@ -168,88 +168,19 @@
 				<el-form-item label="单位" prop="Unit">
 					<el-input v-model="form.Unit" placeholder="请输入单位" />
 				</el-form-item>
-				<el-form-item label="已出库数量" prop="outNumber">
-					<el-input v-model="form.outNumber" placeholder="请输入已出库数量" />
-				</el-form-item>
+				
 				<el-form-item label="库位编号" prop="locCode">
 					<el-input v-model="form.locCode" placeholder="请输入库位编号" />
 				</el-form-item>
-				<el-form-item label="库位名称" prop="locDesc">
-					<el-input v-model="form.locDesc" placeholder="请输入库位名称" />
-				</el-form-item>
+				
 				<el-form-item label="产线名称" prop="productionLineDesc">
 					<el-input v-model="form.productionLineDesc" placeholder="请输入产线名称" />
 				</el-form-item>
-				<el-form-item label="产线编号" prop="productionLineCode">
-					<el-input v-model="form.productionLineCode" placeholder="请输入产线编号" />
-				</el-form-item>
+				
 				<el-form-item label="批次号" prop="userDefined1">
 					<el-input v-model="form.userDefined1" placeholder="请输入批次号" />
 				</el-form-item>
-				<el-form-item label="用户自定义属性2" prop="userDefined2">
-					<el-input v-model="form.userDefined2" placeholder="请输入用户自定义属性2" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性3" prop="userDefined3">
-					<el-input v-model="form.userDefined3" placeholder="请输入用户自定义属性3" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性4" prop="userDefined4">
-					<el-input v-model="form.userDefined4" placeholder="请输入用户自定义属性4" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性5" prop="userDefined5">
-					<el-input v-model="form.userDefined5" placeholder="请输入用户自定义属性5" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性6" prop="userDefined6">
-					<el-input v-model="form.userDefined6" placeholder="请输入用户自定义属性6" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性7" prop="userDefined7">
-					<el-input v-model="form.userDefined7" placeholder="请输入用户自定义属性7" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性8" prop="userDefined8">
-					<el-input v-model="form.userDefined8" placeholder="请输入用户自定义属性8" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性9" prop="userDefined9">
-					<el-input v-model="form.userDefined9" placeholder="请输入用户自定义属性9" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性10" prop="userDefined10">
-					<el-input v-model="form.userDefined10" placeholder="请输入用户自定义属性10" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性11" prop="userDefined11">
-					<el-input v-model="form.userDefined11" placeholder="请输入用户自定义属性11" />
-				</el-form-item>
-				<el-form-item label="供应商编码" prop="supplierCode">
-					<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" />
-				</el-form-item>
-				<el-form-item label="供应商名称" prop="supplierName">
-					<el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
-				</el-form-item>
-				<el-form-item label="创建时间" prop="createDate">
-					<el-date-picker clearable
-						v-model="form.createDate"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择创建时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="最后更新人" prop="lastUpdateBy">
-					<el-input v-model="form.lastUpdateBy" placeholder="请输入最后更新人" />
-				</el-form-item>
-				<el-form-item label="最后更新时间" prop="lastUpdateDate">
-					<el-date-picker clearable
-						v-model="form.lastUpdateDate"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择最后更新时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="可用标识" prop="Active">
-					<el-input v-model="form.Active" placeholder="请输入可用标识" />
-				</el-form-item>
-				<el-form-item label="企业主键" prop="enterpriseId">
-					<el-input v-model="form.enterpriseId" placeholder="请输入企业主键" />
-				</el-form-item>
-				<el-form-item label="企业编码" prop="enterpriseCode">
-					<el-input v-model="form.enterpriseCode" placeholder="请输入企业编码" />
-				</el-form-item>
+				
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>

From 5d0e0e9ec674361992e3d860184c3e8c40dad0ce Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 13:06:58 +0800
Subject: [PATCH 10/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/product/index.vue | 64 ++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index 4eb2d87..74a8216 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -1,18 +1,18 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			<el-form-item label="物料编码" prop="productCode">
+			<el-form-item label="产品编码" prop="productCode">
 				<el-input
 					v-model="queryParams.productCode"
-					placeholder="请输入物料编码"
+					placeholder="请输入产品编码"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="物料名称" prop="productDescZh">
+			<el-form-item label="产品名称" prop="productDescZh">
 				<el-input
 					v-model="queryParams.productDescZh"
-					placeholder="请输入物料名称"
+					placeholder="请输入产品名称"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
@@ -73,19 +73,19 @@
 		<el-table v-loading="loading" :data="productList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<!-- <el-table-column label="主键ID" align="center" prop="productId" /> -->
-			<el-table-column label="物料编码" align="center" prop="productCode" />
-			<el-table-column label="物料类别" align="center" prop="productGroup">
+			<el-table-column label="产品编码" align="center" prop="productCode" width="200"/>
+			<el-table-column label="产品类别" align="center" prop="productGroup">
 			  <template slot-scope="scope">
-          {{ scope.row.productGroup == "material_type1" ? "物料类别1" : "物料类别2" }}
+          {{ scope.row.productGroup == "material_type1" ? "产品类别1" : "产品类别2" }}
         </template>
       </el-table-column>
-			<!-- 中文描述也就是物料名称 -->
-			<el-table-column label="物料名称" align="center" prop="productDescZh" />
-			<el-table-column label="物料型号" align="center" prop="productModel" />
+			<!-- 中文描述也就是产品名称 -->
+			<el-table-column label="产品名称" align="center" prop="productDescZh" width="400"/>
+			<el-table-column label="产品型号" align="center" prop="productModel" />
 			<!-- <el-table-column label="英文描述" align="center" prop="productDescEn" />
 			<el-table-column label="序列号规则代码" align="center" prop="ruleCode" />
-			<el-table-column label="旧物料号" align="center" prop="oldProductCode" />
-			<el-table-column label="散件物料号" align="center" prop="partsProductCode" />
+			<el-table-column label="旧产品号" align="center" prop="oldProductCode" />
+			<el-table-column label="散件产品号" align="center" prop="partsProductCode" />
 			<el-table-column label="69码" align="center" prop="skuBarcode" />
 			<el-table-column label="长" align="center" prop="length" />
 			<el-table-column label="宽" align="center" prop="width" />
@@ -120,7 +120,7 @@
 			<el-table-column label="是否补料" align="center" prop="appendFlag" />
 			<el-table-column label="补料比例" align="center" prop="appendPercent" /> -->
 			<el-table-column label="创建人" align="center" prop="createBy" />
-			<el-table-column label="创建时间" align="center" prop="createTime" />
+			<el-table-column label="创建时间" align="center" prop="createTime" width="200"/>
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button
@@ -149,20 +149,20 @@
 			@pagination="getList"
 		/>
 
-		<!-- 添加或修改物料信息对话框 -->
+		<!-- 添加或修改产品信息对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-form-item label="物料编码" prop="productCode">
-					<el-input v-model="form.productCode" placeholder="请输入产品代码" />
+				<el-form-item label="产品编码" prop="productCode">
+					<el-input v-model="form.productCode" placeholder="请输入产品代码" style="width:350px"/>
 				</el-form-item>
-				<el-form-item label="物料名称" prop="productDescZh">
-					<el-input v-model="form.productDescZh" placeholder="请输入物料名称" />
+				<el-form-item label="产品名称" prop="productDescZh">
+					<el-input v-model="form.productDescZh" placeholder="请输入产品名称" style="width:350px"/>
 				</el-form-item>
-				<el-form-item label="物料型号" prop="productModel">
-        	<el-input v-model="form.productModel" placeholder="请输入物料名称" />
+				<el-form-item label="产品型号" prop="productModel">
+        	<el-input v-model="form.productModel" placeholder="请输入产品型号" style="width:350px"/>
         </el-form-item>
-				<el-form-item label="物料类别" prop="productGroup">
-        	<el-select v-model="form.productGroup" placeholder="请选择物料类别">
+				<el-form-item label="产品类别" prop="productGroup">
+        	<el-select v-model="form.productGroup" placeholder="请选择产品类别" style="width:350px">
             <el-option
               v-for="dict in dict.type.material_type"
               :key="dict.value"
@@ -177,11 +177,11 @@
 				<el-form-item label="序列号规则代码" prop="ruleCode">
 					<el-input v-model="form.ruleCode" placeholder="请输入序列号规则代码" />
 				</el-form-item>
-				<el-form-item label="旧物料号" prop="oldProductCode">
-					<el-input v-model="form.oldProductCode" placeholder="请输入旧物料号" />
+				<el-form-item label="旧产品号" prop="oldProductCode">
+					<el-input v-model="form.oldProductCode" placeholder="请输入旧产品号" />
 				</el-form-item>
-				<el-form-item label="散件物料号" prop="partsProductCode">
-					<el-input v-model="form.partsProductCode" placeholder="请输入散件物料号" />
+				<el-form-item label="散件产品号" prop="partsProductCode">
+					<el-input v-model="form.partsProductCode" placeholder="请输入散件产品号" />
 				</el-form-item>
 				<el-form-item label="69码" prop="skuBarcode">
 					<el-input v-model="form.skuBarcode" placeholder="请输入69码" />
@@ -238,7 +238,7 @@
 					<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
 				</el-form-item> -->
 				<el-form-item label="是否启用" prop="activeFlag">
-				  <el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
+				  <el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:350px">
             <el-option v-for="item in options" :key="item.activeFlag" :label="item.label" :value="item.activeFlag"></el-option>
           </el-select>
 				</el-form-item>
@@ -304,7 +304,7 @@ export default {
 			showSearch: true,
 			// 总条数
 			total: 0,
-			// 物料信息表格数据
+			// 产品信息表格数据
 			productList: [],
 			// 弹出层标题
 			title: "",
@@ -376,7 +376,7 @@ export default {
 		indexMethod(index) {
         return index + 1;
         },
-		/** 查询物料信息列表 */
+		/** 查询产品信息列表 */
 		getList() {
 			this.loading = true;
 			listProduct(this.queryParams).then(response => {
@@ -458,7 +458,7 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = "添加物料信息";
+			this.title = "添加产品信息";
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -467,7 +467,7 @@ export default {
 			getProduct(productId).then(response => {
 				this.form = response.data;
 				this.open = true;
-				this.title = "修改物料信息";
+				this.title = "修改产品信息";
 			});
 		},
 		/** 提交按钮 */
@@ -493,7 +493,7 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const productIds = row.productId || this.ids;
-			this.$modal.confirm('是否确认删除物料信息编号为"' + productIds + '"的数据项？').then(function() {
+			this.$modal.confirm('是否确认删除产品信息编号为"' + productIds + '"的数据项？').then(function() {
 				return delProduct(productIds);
 			}).then(() => {
 				this.getList();

From a1f69a0c54be44c9c3aec18ff4d9ce6f8dc3737c Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 13:13:38 +0800
Subject: [PATCH 11/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/equipment/equipmentBoundMaterials.vue | 427 ------------------
 src/views/wms/equipment/index.vue             |  10 +-
 2 files changed, 1 insertion(+), 436 deletions(-)
 delete mode 100644 src/views/wms/equipment/equipmentBoundMaterials.vue

diff --git a/src/views/wms/equipment/equipmentBoundMaterials.vue b/src/views/wms/equipment/equipmentBoundMaterials.vue
deleted file mode 100644
index 476898a..0000000
--- a/src/views/wms/equipment/equipmentBoundMaterials.vue
+++ /dev/null
@@ -1,427 +0,0 @@
-<template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			<el-form-item label="设备编码" prop="equipmentCode">
-				<el-input
-					v-model="queryParams.equipmentCode"
-					placeholder="请输入设备编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="设备名称" prop="equipmentName">
-				<el-input
-					v-model="queryParams.equipmentName"
-					placeholder="请输入设备名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="产品编码" prop="productCode">
-				<el-input
-					v-model="queryParams.productCode"
-					placeholder="请输入产品编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="产品名称" prop="productDescZh">
-				<el-input
-					v-model="queryParams.productDescZh"
-					placeholder="请输入产品名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item>
-				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-			</el-form-item>
-		</el-form>
-
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['wms:product:list']"
-				>新增</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<!-- <el-button
-					type="success"
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['wms:equipmentBoundMaterials:edit']"
-				>修改</el-button> -->
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-delete"
-					size="mini"
-					:disabled="multiple"
-					@click="handleDelete"
-					v-hasPermi="['wms:equipmentBoundMaterials:remove']"
-				>删除</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['wms:equipmentBoundMaterials:export']"
-				>导出</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
-
-		<el-table v-loading="loading" :data="equipmentBoundMaterialsList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center" />
-			      						<!-- 序号 -->
-                        <el-table-column
-                          type="index"
-                          width="90"
-                          align="center"
-                          :index="indexMethod"
-                          label="序号">
-                        </el-table-column>
-			<el-table-column label="物料编码" align="center" prop="productCode" />
-			<el-table-column label="物料名称" align="center" prop="productDescZh" />
-			<el-table-column label="物料型号" align="center" prop="productModel" />
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['wms:equipmentBoundMaterials:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:equipmentBoundMaterials:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
-
-		<!-- 添加或修改设备绑定产品对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-			<!-- <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-			<el-table v-loading="loading" :data="productList" @selection-change="handleSelectionProductChange">
-      			<el-table-column type="selection" width="55" align="center" /> -->
-      						<!-- 序号 -->
-                  <!-- <el-table-column
-                    type="index"
-                    width="90"
-                    align="center"
-                    :index="indexMethod"
-                    label="序号"> -->
-                  <!-- </el-table-column>
-      			<el-table-column label="物料编码" align="center" prop="form.productCode" />
-      			<el-table-column label="物料名称" align="center" prop="form.productDescZh" />
-      			<el-table-column label="物料型号" align="center" prop="form.productModel" />
-      		</el-table>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-				<el-button
-					type="primary"
-					plain
-					size="mini"
-					@click="handleProductQuery"
-					v-hasPermi="['wms:product:list']"
-				></el-button>
-			</div>
-		</el-form> -->
-
-		<el-form :model="form" :rules="rules" ref="form" label-width="110px">
-            <el-table v-loading="loading" :data="productList" @selection-change="handleSelectionProductChange" >
-			  <el-table-column type="selection" width="55" align="center" />
-				<!-- 序号 -->
-                  <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
-				  <el-table-column label="物料编码" align="center" prop="productCode" />
-      			  <el-table-column label="物料型号" align="center" prop="form.productModel" />
-            </el-table>
-			<el-button type="primary" @click="submitForm">确 定</el-button>
-                  <el-button @click="cancel">取 消</el-button>
-				  <el-button
-					type="primary"
-					plain
-					size="mini"
-					@click="handleProductQuery"
-					v-hasPermi="['wms:product:list']"
-				></el-button>
-        </el-form>
-		</el-dialog>
-
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryProductParams.pageNum"
-			:limit.sync="queryProductParams.pageSize"
-			@pagination="getProductList"
-		/>
-	</div>
-</template>
-
-<script>
-import { listEquipmentBoundMaterials, getEquipmentBoundMaterials, delEquipmentBoundMaterials, addEquipmentBoundMaterials, updatEquipmentBoundMaterials } from "@/api/wms/equipmentBoundMaterials";
-import { listProduct, getProduct, delProduct, addProduct, updateProduct } from "@/api/wms/product";
-export default {
-	name: "EquipmentBoundMaterials",
-	data() {
-		return {
-			// 遮罩层
-			loading: true,
-			// 遮罩层
-			// productLoading: true,
-			// 选中数组
-			// productIds: [],
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非单个禁用
-			// productSingle: true,
-			// 非多个禁用
-			// productMultiple: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 总条数
-			// total: 0,
-			// 物料信息表格数据
-			productList: [],
-			// 设备绑定产品表格数据
-			equipmentBoundMaterialsList: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				equipmentCode: null,
-				equipmentName: null,
-				productCode: null,
-				productDescZh: null,
-				equipmentTypeId: null,
-				equipmentTypeCode: null,
-				equipmentTypeName: null,
-				workshopId: null,
-				workshopCode: null,
-				workshopName: null,
-				status: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				attr4: null,
-			},
-			queryProductParams: {
-				pageNum: 1,
-				pageSize: 10,
-				productId: null,
-				productCode: null,
-				productDescZh: null,
-				productModel:null,
-			},
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {
-				equipmentCode: [
-					{ required: true, message: "设备编码不能为空", trigger: "blur" }
-				],
-				productCode: [
-					{ required: true, message: "产品编码不能为空", trigger: "blur" }
-				],
-				productDescZh: [
-					{ required: true, message: "产品名称不能为空", trigger: "blur" }
-				],
-			}
-		};
-	},
-	created() {
-		this.getList();
-		this.getProductList();
-	},
-	methods: {
-	    // 生成表头序号
-        indexMethod(index){
-        return index+1 ;
-      },
-		/** 查询设备绑定产品列表 */
-		getList() {
-			this.loading = true;
-			listEquipmentBoundMaterials(this.queryParams).then(response => {
-				this. equipmentBoundMaterialsList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		/** 查询物料信息列表 */
-		getProductList() {
-			this.loading = true;
-			listProduct(this.queryProductParams).then(response => {
-				this.productList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				productId: null,
-				productCode: null,
-				productDescZh: null,
-				productModel:null,
-				equipmentId: null,
-				equipmentCode: null,
-				equipmentName: null,
-				productCode: null,
-				productDescZh: null,
-				equipmentTypeId: null,
-				equipmentTypeCode: null,
-				equipmentTypeName: null,
-				workshopId: null,
-				workshopCode: null,
-				workshopName: null,
-				status: null,
-				remark: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				attr4: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null
-			};
-			this.resetForm("form");
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 搜索按钮操作 */
-		handleProductQuery() {
-			this.queryProductParams.pageNum = 1;
-			this.getProductList();
-			console.log(this.form);
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionProductChange(selection) {
-		   this.ids = selection.map(item => item.productId)
-		   this.single = selection.length!==1
-		   this.multiple = !selection.length
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.equipmentId)
-			this.single = selection.length!==1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			// this.queryProductParams.pageNum = 1;
-			// this.getProductList();
-			this.reset();
-			this.open = true;
-			this.title = "添加设备绑定产品";
-		},
-		/** 修改按钮操作 */
-		// handleUpdate(row) {
-		// 	this.reset();
-		// 	const equipmentId = row.equipmentId || this.ids
-		// 	getEquipmentBoundMaterials(equipmentId).then(response => {
-		// 		this.form = response.data;
-		// 		this.open = true;
-		// 		this.title = "修改设备绑定产品";
-		// 	});
-		// },
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					console.log(this.form.equipmentId);
-					if (this.form.equipmentId != null) {
-					// 	updateEquipmentBoundMaterials(this.form).then(response => {
-					// 		this.$modal.msgSuccess("修改成功");
-					// 		this.open = false;
-					// 		this.getList();
-					// 	});
-					// } else
-					// if(this.form.productId != null){
-						addEquipmentBoundMaterials(this.form).then(response => {
-							this.$modal.msgSuccess("绑定成功");
-							this.open = false;
-							this.getProductList();
-						});
-					}
-					// else {
-					// 	addEquipmentBoundMaterials(this.form).then(response => {
-					// 		this.$modal.msgSuccess("新增成功");
-					// 		this.open = false;
-					// 		this.getList();
-					// 	});
-					// }
-				}
-			});
-		},
-
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const equipmentIds = row.equipmentId || this.ids;
-			this.$modal.confirm('是否确认删除设备绑定产品编号为"' + equipmentIds + '"的数据项？').then(function() {
-				return delEquipmentBoundMaterials(equipmentIds);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('wms/equipmentBoundMaterials/export', {
-				...this.queryParams
-			}, ` equipmentBoundMaterials_${new Date().getTime()}.xlsx`)
-		}
-	}
-};
-</script>
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 5957b30..17c0a44 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -198,11 +198,6 @@
                     </el-col>
                 </el-row>
 			</el-form>
-			<el-tabs type="border-card" v-if="form.equipmentCode != null">
-        <el-tab-pane label="设备绑定物料">
-          <EquipmentBoundMaterials v-if="form.equipmentCode != null" :optType="optType" :equipmentCode="form.equipmentCode"></EquipmentBoundMaterials>
-        </el-tab-pane>
-      </el-tabs>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
 				<el-button @click="cancel">取 消</el-button>
@@ -213,10 +208,8 @@
 
 <script>
 import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment";
-import EquipmentBoundMaterials from "./equipmentBoundMaterials";
 export default {
 	name: "Equipment",
-	components: {EquipmentBoundMaterials},
 	dicts: ['sys_normal_disable', 'equ_type'],
 	data() {
 		return {
@@ -381,7 +374,6 @@ export default {
 				this.title = "修改设备管理";
 			});
 		},
-		// 查询明细按钮操作
     // 查询明细按钮操作
     handleView(row){
       this.reset();
@@ -389,7 +381,7 @@ export default {
       getEquipment(equipmentId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "查看设备绑定信息";
+        this.title = "查看设备信息";
         this.optType = "view";
       });
     },

From 3fe2ac9d757a48d3799cd6d511bf9828e39b3667 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 13:52:02 +0800
Subject: [PATCH 12/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/equipment/index.vue | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 17c0a44..ea5bb60 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -94,7 +94,11 @@
 			<el-table-column label="设备类型名称" align="center" prop="equipmentTypeName" width="100"/>
 			<el-table-column label="所属车间编码" align="center" prop="workshopCode" width="100"/>
 			<el-table-column label="所属车间名称" align="center" prop="workshopName" width="100"/>
-			<el-table-column label="设备状态" align="center" prop="status" />
+			<el-table-column label="设备状态" align="center" prop="status">
+        <template slot-scope="scope">
+          {{ scope.row.status == 1 ? "是" : "否" }}
+        </template>
+      </el-table-column>
 			<el-table-column label="单台能力工时" align="center" prop="unitWorkingHours" width="100"/>
 			<el-table-column label="工段" align="center" prop="workshopSection" />
 			<el-table-column label="设备位置" align="center" prop="equipmentLocation" />
@@ -150,7 +154,7 @@
                     </el-col>
                     <el-col :span="12">
 						<el-form-item label="设备类型" prop="equipmentTypeCode">
-							<el-select v-model="form.equipmentTypeCode" placeholder="请选择设备类型">
+							<el-select v-model="form.equipmentTypeCode" placeholder="请选择设备类型" style="width:355px">
                 <el-option
                   v-for="dict in dict.type.equ_type"
                   :key="dict.value"
@@ -197,6 +201,11 @@
 						</el-form-item>
                     </el-col>
                 </el-row>
+            <el-form-item label="设备状态" prop="status" >
+              <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:350px">
+                 <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
+              </el-select>
+            </el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -255,6 +264,13 @@ export default {
 				equipmentLocation: null,
 				hourlyUnitPrice: null
 			},
+			  options: [{
+          status: "1",
+          label: '是'
+        }, {
+          status: "0",
+          label: '否'
+        }],
 			// 表单参数
 			form: {},
 			// 表单校验

From da52c668f82f4217e0b56c0fabe72d36fac2dd28 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 14:07:47 +0800
Subject: [PATCH 13/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/machinery/index.vue | 54 +++++++++++++------------------
 1 file changed, 23 insertions(+), 31 deletions(-)

diff --git a/src/views/wms/machinery/index.vue b/src/views/wms/machinery/index.vue
index 90b8375..920fdfc 100644
--- a/src/views/wms/machinery/index.vue
+++ b/src/views/wms/machinery/index.vue
@@ -75,6 +75,7 @@
             <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
 			<el-table-column label="机台编码" align="center" prop="machineryCode" />
 			<el-table-column label="机台名称" align="center" prop="machineryName" />
+			<el-table-column label="设备类型" align="center" prop="machineryTypeCode" />
 			<el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column prop="status" label="是否启用" align="center" >
@@ -113,41 +114,36 @@
 		<!-- 添加或修改机台管理对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
-				<el-form-item label="机台编码" prop="machineryCode">
+				<el-form-item label="机台编码" prop="machineryCode" style="width:400px">
 					<el-input v-model="form.machineryCode" placeholder="请输入机台类型编码" />
 				</el-form-item>
-				<el-form-item label="机台名称" prop="machineryName">
+				<el-form-item label="机台名称" prop="machineryName" style="width:400px">
 					<el-input v-model="form.machineryName" placeholder="请输入机台类型名称" />
 				</el-form-item>
-				<el-form-item label="品牌" prop="machineryBrand">
+				<el-form-item label="品牌" prop="machineryBrand" style="width:400px">
 					<el-input v-model="form.machineryBrand" placeholder="请输入品牌" />
 				</el-form-item>
-				<el-form-item label="规格型号" prop="machinerySpec">
+				<el-form-item label="规格型号" prop="machinerySpec" style="width:400px">
 					<el-input v-model="form.machinerySpec" placeholder="请输入规格型号" />
 				</el-form-item>
-				<el-form-item label="机台类型ID" prop="machineryTypeId">
-					<el-input v-model="form.machineryTypeId" placeholder="请输入机台类型ID" />
-				</el-form-item>
-				<el-form-item label="机台类型编码" prop="machineryTypeCode">
-					<el-input v-model="form.machineryTypeCode" placeholder="请输入机台类型编码" />
-				</el-form-item>
-				<el-form-item label="机台类型名称" prop="machineryTypeName">
-					<el-input v-model="form.machineryTypeName" placeholder="请输入机台类型名称" />
-				</el-form-item>
-				<el-form-item label="所属线体ID" prop="workshopId">
-					<el-input v-model="form.workshopId" placeholder="请输入所属车间ID" />
+				<el-form-item label="设备类型" prop="machineryTypeCode">
+					<el-select v-model="form.machineryTypeCode" placeholder="请选择设备类型" style="width:300px">
+            <el-option
+              v-for="dict in dict.type.equ_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
 				</el-form-item>
-				<el-form-item label="所属线体编码" prop="workshopCode">
+				<el-form-item label="所属线体编码" prop="workshopCode" style="width:400px">
 					<el-input v-model="form.workshopCode" placeholder="请输入所属车间编码" />
 				</el-form-item>
-				<el-form-item label="机台产能" prop="">
-        	<el-input v-model="form.workshopCode" placeholder="" />
-   			</el-form-item>
-				<el-form-item label="所属车间名称" prop="workshopName">
+				<el-form-item label="所属车间名称" prop="workshopName" style="width:400px">
 					<el-input v-model="form.workshopName" placeholder="请输入所属车间名称" />
 				</el-form-item>
-				<el-form-item label="是否启用" prop="status">
-          <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
+				<el-form-item label="是否启用" prop="status" style="width:400px">
+          <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:300px">
             <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
           </el-select>
         </el-form-item>
@@ -166,6 +162,7 @@ import { listMachinery, getMachinery, delMachinery, addMachinery, updateMachiner
 
 export default {
 	name: "Machinery",
+	dicts: ['sys_normal_disable', 'equ_type'],
 	data() {
 		return {
 			// 遮罩层
@@ -220,15 +217,6 @@ export default {
 				machineryCode: [
 					{ required: true, message: "机台类型编码不能为空", trigger: "blur" }
 				],
-				machineryName: [
-					{ required: true, message: "机台类型名称不能为空", trigger: "blur" }
-				],
-				machineryTypeId: [
-					{ required: true, message: "机台类型ID不能为空", trigger: "blur" }
-				],
-				workshopId: [
-					{ required: true, message: "所属车间ID不能为空", trigger: "blur" }
-				],
 				status: [
 					{ required: true, message: "机台状态不能为空", trigger: "change" }
 				],
@@ -239,6 +227,10 @@ export default {
 		this.getList();
 	},
 	methods: {
+	   // 生成表头序号
+        indexMethod(index){
+        return index+1 ;
+        },
 		/** 查询机台管理列表 */
 		getList() {
 			this.loading = true;

From ad5af953e9fdc8ea24fe37b51fa4634dd2629b5a Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 14:11:58 +0800
Subject: [PATCH 14/23] =?UTF-8?q?=E6=9C=BA=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/machinery/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/machinery/index.vue b/src/views/wms/machinery/index.vue
index 920fdfc..ae991bb 100644
--- a/src/views/wms/machinery/index.vue
+++ b/src/views/wms/machinery/index.vue
@@ -1,18 +1,18 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			<el-form-item label="机台类型编码" prop="machineryCode" label-width="108px">
+			<el-form-item label="机台编码" prop="machineryCode" label-width="108px">
 				<el-input
 					v-model="queryParams.machineryCode"
-					placeholder="请输入机台类型编码"
+					placeholder="请输入机台编码"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="机台类型名称" prop="machineryName" label-width="108px">
+			<el-form-item label="机台名称" prop="machineryName" label-width="108px">
       			<el-input
       				v-model="queryParams.machineryName"
-      				placeholder="请输入机台类型名称"
+      				placeholder="请输入机台名称"
       				clearable
       				@keyup.enter.native="handleQuery"
       			/>

From d77b87accd1690491f60beab86d9c654e370f05d Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 14:35:49 +0800
Subject: [PATCH 15/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/location/index.vue | 49 +++++++++++++-------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/src/views/wms/location/index.vue b/src/views/wms/location/index.vue
index 6e6075f..49caf48 100644
--- a/src/views/wms/location/index.vue
+++ b/src/views/wms/location/index.vue
@@ -88,9 +88,7 @@
         label="序号">
       </el-table-column>
 			<el-table-column label="仓库编码" align="center" prop="warehouseCode" />
-			<el-table-column label="仓库名称" align="center" prop="warehouseName" />
 			<el-table-column label="库区编码" align="center" prop="areaCode" />
-			<el-table-column label="库区名称" align="center" prop="areaDesc" />
 			<el-table-column label="货位编码" align="center" prop="locationCode" />
 			<el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime"/>
@@ -128,38 +126,24 @@
 		/>
 
 		<!-- 添加或修改货位管理对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
-				<el-row :gutter="10" class="mb8">
-                    <el-col :span="12">
 						<el-form-item label="仓库编码" prop="warehouseCode">
-					       <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
+					    <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" style="width:300px"/>
 				        </el-form-item>
-                        <el-form-item label="仓库名称" prop="locationCode">
-                     		<el-input v-model="form.locationCode" placeholder="请输入仓库编码" />
-                     	</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="库区编码" prop="areaCode">
-							<el-input v-model="form.areaCode" placeholder="请输入库区编码" />
+					  <el-form-item label="库区编码" prop="areaCode">
+							<el-input v-model="form.areaCode" placeholder="请输入库区编码" style="width:300px"/>
 						</el-form-item>
-						<el-form-item label="库区名称" prop="warehouseCode">
-					       <el-input v-model="form.warehouseCode" placeholder="请输入库区名称" />
-				        </el-form-item>
-                    </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
-                    <el-col :span="12">
-                        <el-form-item label="货位编码" prop="locationCode">
-							<el-input v-model="form.locationCode" placeholder="请输入货位编码" />
-						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="是否启用" prop="activeFlag">
-							<el-input v-model="form.activeFlag" placeholder="请输入是否启用" />
+						</el-col>
+						 </el-row>
+               <el-form-item label="货位编码" prop="locationCode">
+							<el-input v-model="form.locationCode" placeholder="请输入货位编码" style="width:300px"/>
 						</el-form-item>
-                    </el-col>
-                </el-row>
+					  <el-form-item label="是否启用" prop="activeFlag" >
+              <el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:300px">
+                <el-option v-for="item in options" :key="item.activeFlag" :label="item.label" :value="item.activeFlag"></el-option>
+              </el-select>
+            </el-form-item>
 				                        <!-- <el-form-item label="上架顺序" prop="shelfOrder">
                             <el-input v-model="form.shelfOrder" placeholder="请输入上架顺序" />
                         </el-form-item> -->
@@ -385,6 +369,13 @@ export default {
 				factoryCode: null,
 				syntozk: null
 			},
+				options: [{
+          activeFlag: "1",
+          label: '是'
+        }, {
+          activeFlag: "0",
+          label: '否'
+        }],
 			// 表单参数
 			form: {},
 			// 表单校验

From c89e192f1d8e1d12f5e6f640a3188647fcc7a3e9 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 14:53:43 +0800
Subject: [PATCH 16/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E7=8F=AD=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/team/index.vue | 127 +++++++++++++++++++----------------
 1 file changed, 68 insertions(+), 59 deletions(-)

diff --git a/src/views/wms/team/index.vue b/src/views/wms/team/index.vue
index 4c0a8b0..61f58f6 100644
--- a/src/views/wms/team/index.vue
+++ b/src/views/wms/team/index.vue
@@ -87,6 +87,8 @@
        	 		</template>
       		</el-table-column>
 			<el-table-column label="所属产线" align="center" prop="productionLineCode" />
+			<el-table-column label="负责人" align="center" prop="teamLeaderName" />
+			<el-table-column label="班组组成人员" align="center" prop="teamMembers" />
 			<el-table-column label="创建人" align="center" prop="createBy" />
 			<el-table-column label="创建时间" align="center" prop="createDate" />
 			<el-table-column prop="active" label="是否启用" align="center">
@@ -126,86 +128,93 @@
 		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="110px">
 				<el-row :gutter="10" class="mb8">
-                    <el-col :span="12">
-						<el-form-item label="班组编码" prop="teamCode">
-					<el-input v-model="form.teamCode" placeholder="请输入班组编码" />
-				</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="班组名称" prop="teamDescGlobal">
-					<el-input v-model="form.teamDescGlobal" placeholder="请输入班组通用名称" />
-				</el-form-item>
-                    </el-col>
-                </el-row>
+          <el-col :span="12">
+						<el-form-item label="班组编码" prop="teamCode" style="width:450px">
+			        <el-input v-model="form.teamCode" placeholder="请输入班组编码" />
+				    </el-form-item>
+          </el-col>
+          <el-col :span="12">
+						<el-form-item label="班组名称" prop="teamDescGlobal" style="width:450px">
+					    <el-input v-model="form.teamDescGlobal" placeholder="请输入班组通用名称" />
+				    </el-form-item>
+          </el-col>
+        </el-row>
 				<el-row :gutter="10" class="mb8">
-                    <el-col :span="12">
-						<el-form-item label="班组类型" prop="teamType">
-        					<el-select v-model="form.teamType" placeholder="请选择班组">
-            					<el-option
-              						v-for="dict in dict.type.team_type"
-             				 		:key="dict.value"
-             				 		:label="dict.label"
-              				 		:value="dict.value"
-            					></el-option>
-          					</el-select>
-        				</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
+          <el-col :span="12">
+						<el-form-item label="班组类型" prop="teamType" >
+        		  <el-select v-model="form.teamType" placeholder="请选择班组" style="width:340px">
+            	  <el-option
+              		v-for="dict in dict.type.team_type"
+             			:key="dict.value"
+             			:label="dict.label"
+              		:value="dict.value"
+            	  ></el-option>
+          		</el-select>
+        		</el-form-item>
+          </el-col>
+          <el-col :span="12">
 						<el-form-item label="是否启用" prop="active">
-							<el-select v-model="form.active" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
+							<el-select v-model="form.active" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:340px">
                 <el-option v-for="item in options" :key="item.active" :label="item.label" :value="item.active"></el-option>
               </el-select>
 						</el-form-item>
-                    </el-col>
-                </el-row>
+          </el-col>
+        </el-row>
 				<el-row :gutter="10" class="mb8">
-                    <el-col :span="12">
-						<el-form-item label="工厂编码" prop="siteCode">
-							<el-input v-model="form.siteCode" placeholder="请输入工厂编码" />
+          <el-col :span="12">
+						<el-form-item label="工厂编码" prop="siteCode" style="width:450px">
+							<el-input v-model="form.siteCode" placeholder="请输入工厂编码"/>
 						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="所属产线" prop="productionLineCode">
+          </el-col>
+          <el-col :span="12">
+						<el-form-item label="所属产线" prop="productionLineCode" style="width:450px">
 							<el-input v-model="form.productionLineCode" placeholder="请输入线体编码" />
 						</el-form-item>
-                    </el-col>
-                </el-row>
+          </el-col>
+        </el-row>
 				<el-row :gutter="10" class="mb8">
-                    <el-col :span="12">
-						<el-form-item label="班组长编码" prop="teamLeaderCode">
+          <el-col :span="12">
+						<el-form-item label="班组长编码" prop="teamLeaderCode" style="width:450px">
 							<el-input v-model="form.teamLeaderCode" placeholder="请输入班组长编码" />
 						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="定编岗位数量" prop="planPostQuantity">
+          </el-col>
+          <el-col :span="12">
+						<el-form-item label="定编岗位数量" prop="planPostQuantity" style="width:450px">
 							<el-input v-model="form.planPostQuantity" placeholder="请输入定编岗位数量" />
 						</el-form-item>
-                    </el-col>
-                </el-row>
+          </el-col>
+        </el-row>
 				<el-row :gutter="10" class="mb8">
-                    <el-col :span="12">
-						<el-form-item label="已分配岗位数量" prop="actualPostQuantity">
-							<el-input v-model="form.actualPostQuantity" placeholder="请输入已分配岗位数量" />
+          <el-col :span="12">
+						<el-form-item label="已分配岗位数量" prop="actualPostQuantity" style="width:450px">
+							<el-input v-model="form.actualPostQuantity" placeholder="请输入已分配岗位数量"/>
 						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="班组属性" prop="teamProperties">
-							<el-input v-model="form.teamProperties" placeholder="请输入班组属性" />
+          </el-col>
+          <el-col :span="12">
+						<el-form-item label="班组属性" prop="teamProperties" style="width:450px">
+							<el-input v-model="form.teamProperties" placeholder="请输入班组属性"/>
 						</el-form-item>
-                    </el-col>
-                </el-row>
+          </el-col>
+        </el-row>
 				<el-row :gutter="10" class="mb8">
-                    <el-col :span="12">
-						<el-form-item label="应出勤人数" prop="attendanceQuantity">
-							<el-input v-model="form.attendanceQuantity" placeholder="请输入应出勤人数" />
+          <el-col :span="12">
+						<el-form-item label="应出勤人数" prop="attendanceQuantity" style="width:450px">
+							<el-input v-model="form.attendanceQuantity" placeholder="请输入应出勤人数"/>
 						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="已分配人数" prop="assignedQuantity">
+          </el-col>
+          <el-col :span="12">
+						<el-form-item label="已分配人数" prop="assignedQuantity" style="width:450px">
 							<el-input v-model="form.assignedQuantity" placeholder="请输入已分配人数" />
 						</el-form-item>
-                    </el-col>
-                </el-row>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="班组负责人" prop="teamLeaderName" style="width:450px">
+              <el-input v-model="form.teamLeaderName" placeholder="请输入班组负责人名字" />
+            </el-form-item>
+          </el-col>
+          </el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>

From 5eb3fc5d668b455a34b60018047f004dd81c64ef Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 15:06:15 +0800
Subject: [PATCH 17/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=8F=AD=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/team/index.vue | 49 +++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/team/index.vue b/src/views/wms/team/index.vue
index 61f58f6..a55e237 100644
--- a/src/views/wms/team/index.vue
+++ b/src/views/wms/team/index.vue
@@ -87,8 +87,8 @@
        	 		</template>
       		</el-table-column>
 			<el-table-column label="所属产线" align="center" prop="productionLineCode" />
-			<el-table-column label="负责人" align="center" prop="teamLeaderName" />
-			<el-table-column label="班组组成人员" align="center" prop="teamMembers" />
+			<el-table-column label="班组负责人" align="center" prop="teamLeaderName" />
+			<!-- <el-table-column label="班组组成人员" align="center" prop="teamMembers" /> -->
 			<el-table-column label="创建人" align="center" prop="createBy" />
 			<el-table-column label="创建时间" align="center" prop="createDate" />
 			<el-table-column prop="active" label="是否启用" align="center">
@@ -216,6 +216,22 @@
           </el-col>
           </el-row>
 			</el-form>
+			<!-- <el-divider></el-divider>
+			<el-card>
+        <div style="text-align: center">
+         <template>
+            <el-transfer
+              filterable
+              filter-placeholder="请输入班组人员名称"
+              :titles="['可选班组人员', '当前班组人员']"
+              :data="leftList"
+              v-model="rightList"
+              style="text-align: left"
+              >
+            </el-transfer>
+          </template>
+        </div>
+       </el-card> -->
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
 				<el-button @click="cancel">取 消</el-button>
@@ -225,7 +241,7 @@
 </template>
 
 <script>
-import { listTeam, getTeam, delTeam, addTeam, updateTeam } from "@/api/wms/team";
+import { listTeam, getTeam, delTeam, addTeam, updateTeam ,listTeamMembers} from "@/api/wms/team";
 
 export default {
 	name: "Team",
@@ -246,6 +262,11 @@ export default {
 			total: 0,
 			// 班组表格数据
 			teamList: [],
+			teamMembersList:[],
+	// 		// 可选（左边）
+    //   leftList: [],
+    //   // 已选（右边，只需要key）
+    //   rightList: [],
 			// 弹出层标题
 			title: "",
 			// 是否显示弹出层
@@ -302,12 +323,31 @@ export default {
 	},
 	created() {
 		this.getList();
+		this.getTeamMembers();
 	},
 	methods: {
 	  // 生成表头序号
     indexMethod(index) {
       return index + 1;
     },
+    // getTeamMembers() {
+    //   // 调用查询课程列表接口
+    //   listTeamMembers(this.queryParams).then(response => {
+    //     for(let i in response.rows){
+    //     // 将返回的列表赋值于穿梭框左边列表
+    //       this.leftList.push({
+    //       key: response.rows[i].userId,
+    //       label: response.rows[i].userName
+    //     })
+    //     }
+    //     for(let i in response.selected){
+    //     // 将返回的列表赋值于穿梭框左边列表
+    //     this.rightList.push(response.selected[i].key);
+    //     this.form.rightData = this.rightList;
+    //     }
+    //     this.loading = false;
+    //   });
+    // },
 		/** 查询班组列表 */
 		getList() {
 			this.loading = true;
@@ -348,6 +388,7 @@ export default {
 				teamProperties: null,
 				attendanceQuantity: null,
 				assignedQuantity: null
+				// rightData: null
 			};
 			this.resetForm("form");
 		},
@@ -388,7 +429,9 @@ export default {
 			this.$refs["form"].validate(valid => {
 				if (valid) {
 					if (this.form.teamId != null) {
+					  this.form.rightData = this.rightList;
 						updateTeam(this.form).then(response => {
+						console.log("打印1",this.rightList,"打印2",this.form.rightData);
 							this.$modal.msgSuccess("修改成功");
 							this.open = false;
 							this.getList();

From 8d6837b06fe8857cfce69cc2a6987ed293ad26b1 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 16:06:17 +0800
Subject: [PATCH 18/23] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F-?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/technology/process/index.vue | 40 ++++++++++++--------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/views/technology/process/index.vue b/src/views/technology/process/index.vue
index d16f94b..56d3268 100644
--- a/src/views/technology/process/index.vue
+++ b/src/views/technology/process/index.vue
@@ -140,12 +140,12 @@
               <el-input v-model="form.processCode" placeholder="请输入工序编码" />
             </el-form-item>
           </el-col>
-          <el-col :span="7">
+          <el-col :span="8">
             <el-form-item label="工序名称" prop="processName">
               <el-input v-model="form.processName" placeholder="请输入工序名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="是否启用" prop="enableFlag">
                <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
                 <el-radio
@@ -178,12 +178,24 @@
             </el-form-item>
           </el-col>
           <!--
-          <el-col :span="7">
+          <el-col :span="8">
             <el-form-item label="拆合值" prop="splitMergeNum">
               <el-input v-model="form.splitMergeNum" placeholder="请输入拆分&合并数量" />
             </el-form-item>
           </el-col>-->
-          <el-col :span="6">
+          <el-col :span="8">
+            <el-form-item label="工作时间" prop="workTime">
+              <el-input-number :min="0" :step="1" v-model="form.workTime" placeholder="请输入工作时长" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工作中心" prop="workCenter">
+              <el-input v-model="form.workCenter" type="input" placeholder="请输入工作中心" />
+                </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="可多单运行" prop="sync">
                <el-radio-group v-model="form.sync" disabled v-if="optType=='view'">
                 <el-radio
@@ -201,21 +213,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="工作中心" prop="workCenter">
-              <el-input v-model="form.workCenter" type="input" placeholder="请输入工作中心" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="工作时间" prop="workTime">
-              <el-input-number :min="0" :step="1" v-model="form.workTime" placeholder="请输入工作时长" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-          <el-row>
-            <el-col :span="12">
+            <el-col :span="16">
               <el-form-item label="线体设备" prop="equipment">
                 <el-input v-model="form.equipment" placeholder="请选择线体设备" >
                   <el-button slot="append" @click="handleSelectEquipment" icon="el-icon-search"></el-button>
@@ -224,7 +222,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :span="8">
             <el-form-item label="参数1温度" prop="param1">
               <el-input v-model="form.param1" type="input" placeholder="请输入温度" />
@@ -240,7 +238,7 @@
               <el-input v-model="form.param3" type="input" placeholder="请输入参数3" />
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
           <el-col :span="24">
             <el-form-item label="工序SOP" prop="fileList">

From f04a9e3767d4440d31e4418877f98da04b7b6d9e Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 16:25:19 +0800
Subject: [PATCH 19/23] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E8=89=BA-?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/technology/proroute/index.vue | 66 ++++++++++++-------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/src/views/technology/proroute/index.vue b/src/views/technology/proroute/index.vue
index 7be4a09..e7d59eb 100644
--- a/src/views/technology/proroute/index.vue
+++ b/src/views/technology/proroute/index.vue
@@ -99,7 +99,7 @@
 
     <el-table v-loading="loading" :data="prorouteList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="工艺路线编号" align="center" prop="routeCode" >
+      <el-table-column label="工艺路线编号" align="center" prop="routeCode" width="100">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -108,14 +108,14 @@
           >{{scope.row.routeCode}}</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="工艺路线名称" align="center" prop="routeName" />
-      <el-table-column label="工艺路线说明" align="center" prop="routeDesc" />
-      <el-table-column label="工艺路线版本" align="center" prop="routeVersion" />
+      <el-table-column label="工艺路线名称" align="center" prop="routeName" width="250"/>
+      <el-table-column label="工艺路线说明" align="center" prop="routeDesc" width="250"/>
+      <el-table-column label="工艺路线版本" align="center" prop="routeVersion" width="100"/>
       <el-table-column label="人工" align="center" prop="tecMan" />
       <el-table-column label="机器" align="center" prop="tecMachine" />
       <el-table-column label="折旧" align="center" prop="tecDepreciation" />
       <el-table-column label="其他" align="center" prop="tecOther" />
-      <el-table-column label="是否需要首检" align="center" prop="needCheck">
+      <el-table-column label="是否需要首检" align="center" prop="needCheck" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.needCheck"/>
         </template>
@@ -176,32 +176,32 @@
               <el-input v-model="form.routeName" placeholder="请输入工艺路线名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否启用" prop="enableFlag">
-              <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
-                <el-radio
-                  v-for="dict in dict.type.sys_yes_no"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-              <el-radio-group v-model="form.enableFlag" v-else>
-                <el-radio
-                  v-for="dict in dict.type.sys_yes_no"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="版本" prop="routeVersion">
               <el-input v-model="form.routeVersion" :disabled="true"/>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+        </el-row>
+        <el-row>
+        <el-col :span="8">
+          <el-form-item label="是否启用" prop="enableFlag">
+            <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
+              <el-radio
+                v-for="dict in dict.type.sys_yes_no"
+                :key="dict.value"
+                :label="dict.value"
+              >{{dict.label}}</el-radio>
+            </el-radio-group>
+            <el-radio-group v-model="form.enableFlag" v-else>
+            <el-radio
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.value"
+              >{{dict.label}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="需要首检" prop="needCheck">
               <el-radio-group v-model="form.needCheck" disabled v-if="optType=='view'">
                 <el-radio
@@ -219,26 +219,24 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="人员" prop="tecMan">
               <el-input v-model="form.tecMan" placeholder="请输入人员信息" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+        </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="机器" prop="tecMachine">
               <el-input v-model="form.tecMachine" placeholder="请输入机器信息" />
                 </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="折旧" prop="tecDepreciation">
               <el-input v-model="form.tecDepreciation" placeholder="请输入折旧信息" />
                 </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="其他" prop="tecOther">
               <el-input v-model="form.tecOther" placeholder="请输入其他信息" />
                 </el-form-item>

From 73ab4a343c96906d616c0a38b3a0de8898297dc7 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 16:27:54 +0800
Subject: [PATCH 20/23] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/product/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index 74a8216..1efec00 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -153,7 +153,7 @@
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
 				<el-form-item label="产品编码" prop="productCode">
-					<el-input v-model="form.productCode" placeholder="请输入产品代码" style="width:350px"/>
+					<el-input v-model="form.productCode" placeholder="请输入产品编码" style="width:350px"/>
 				</el-form-item>
 				<el-form-item label="产品名称" prop="productDescZh">
 					<el-input v-model="form.productDescZh" placeholder="请输入产品名称" style="width:350px"/>

From 29a666bafc867f70fce65f673a2890c9e62c39a0 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 16:31:56 +0800
Subject: [PATCH 21/23] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E8=89=BA-=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/technology/recipe/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/technology/recipe/index.vue b/src/views/technology/recipe/index.vue
index 95e82a9..c683a57 100644
--- a/src/views/technology/recipe/index.vue
+++ b/src/views/technology/recipe/index.vue
@@ -134,13 +134,13 @@
               <el-input v-model="form.recipeCode" placeholder="请输入配方编码" />
             </el-form-item>
           </el-col>
-          
-          <el-col :span="7">
+
+          <el-col :span="8">
             <el-form-item label="配方名称" prop="recipeName">
               <el-input v-model="form.recipeName" placeholder="请输入配方名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="是否启用" prop="enableFlag">
                <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
                 <el-radio
@@ -169,21 +169,21 @@
         </el-row>
 
         <el-row>
-          <el-col :span="24">
+          <el-col :span="22">
             <el-form-item label="配方SOP" prop="fileList">
               <FileUpload v-model="form.fileList"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="22">
             <el-form-item label="配方说明" prop="attention">
               <el-input v-model="form.attention" type="textarea" placeholder="请输入内容" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="22">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
             </el-form-item>

From 839c65dcb6ab0ea4915e993d6ceeca7ed3e23bd0 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 30 Aug 2023 16:32:20 +0800
Subject: [PATCH 22/23] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97(?=
 =?UTF-8?q?=E6=B9=BF=E6=96=99=E5=BC=82=E5=B8=B8=E5=8D=A1=E6=AD=BBBUG?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E3=80=81=E8=AE=A2=E5=8D=95=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80+=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA=E7=BA=BF=E4=BD=93=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E3=80=81=E5=B7=A5=E5=8D=95=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80+=E5=B7=A5=E8=89=BA=E7=BA=BF=E4=BD=93?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/plan/order.js              | 28 ++++++++-
 src/views/plan/order/index.vue     | 94 ++++++++++++++++++------------
 src/views/plan/plan/index.vue      |  1 -
 src/views/plan/workorder/index.vue | 76 ++++++++++++++----------
 4 files changed, 129 insertions(+), 70 deletions(-)

diff --git a/src/api/plan/order.js b/src/api/plan/order.js
index ab9a84e..3e00824 100644
--- a/src/api/plan/order.js
+++ b/src/api/plan/order.js
@@ -1,6 +1,30 @@
 import request from '@/utils/request'
 
-//通过母订单id查询最新工单列表
+// 获取班次信息
+export function getProShifts() {
+  return request({
+    url: '/plan/order/getProShifts/',
+    method: 'get'
+  })
+}
+
+// 通过物料code获取工艺信息
+export function getProRoutes(prodCode) {
+  return request({
+    url: '/plan/order/getProRoutes/' + prodCode,
+    method: 'get'
+  })
+}
+
+// 通过工艺code获取设备信息
+export function getProEquipment(routeCode) {
+  return request({
+    url: '/plan/order/getProEquipment/' + routeCode,
+    method: 'get'
+  })
+}
+
+// 通过母订单id查询最新工单列表
 export function getWorkOrderList(id) {
 	return request({
 		url: '/plan/order/getWorkOrderList/' + id,
@@ -8,7 +32,7 @@ export function getWorkOrderList(id) {
 	})
 }
 
-//通过母订单id查询最新订单列表
+// 通过母订单id查询最新订单列表
 export function getOrderList(id) {
 	return request({
 		url: '/plan/order/getOrderList/' + id,
diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index 0d0850c..a64b030 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -124,16 +124,16 @@
         >导出
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-sort"
-          size="mini"
-          @click="toggleExpandAll"
-        >展开/折叠
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="info"-->
+<!--          plain-->
+<!--          icon="el-icon-sort"-->
+<!--          size="mini"-->
+<!--          @click="toggleExpandAll"-->
+<!--        >展开/折叠-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -334,22 +334,26 @@
         <!-- 编辑框 -->
         <!-- 第一行 -->
         <el-row>
-          <!-- 选择产线 -->
-          <el-col :span="6">
-            <el-form-item label="选择机型:">
-              <el-select size="small" v-model="splitForm.prodLineCode" placeholder="请选择成型机">
-                <el-option v-for="item in proline" :key="item.key" :label="item.label" :value="item.key"></el-option>
+          <el-col :span="7">
+            <!-- 选择工艺 -->
+            <el-form-item size="small" label="选择工艺:" class="my-select my-first">
+              <el-select @change="changeRoute" v-model="splitForm.routeCode" placeholder="请选择工艺">
+                <el-option v-for="item in routes" :key="item.routeCode" :label="item.routeName"
+                           :value="item.routeCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- 拆分数量 -->
-          <el-col :offset="2" :span="7">
-            <el-form-item size="small" label="拆分数量:">
-              <el-input required type="number" @input="splitNumChange" v-model="splitForm.splitNum"></el-input>
+          <el-col :offset="1" :span="7">
+            <!-- 选择产线 -->
+            <el-form-item label="选择线体:">
+              <el-select @focus="changeEquipment" size="small" v-model="splitForm.prodLineCode" placeholder="请选择线体">
+                <el-option v-for="item in proline" :key="item.key" :label="item.label" :value="item.key"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
-          <!-- 工单日期 -->
           <el-col :offset="1" :span="5">
+            <!-- 工单日期 -->
             <el-form-item size="small" label="工单日期: ">
               <el-date-picker @change="checkDate" v-model="splitForm.productDate" type="date" placeholder="选择日期"
               ></el-date-picker>
@@ -358,7 +362,7 @@
         </el-row>
         <!-- 第二行 -->
         <el-row>
-          <el-col :span="6">
+          <el-col :span="7">
             <!-- 选择班次 -->
             <el-form-item size="small" label="选择班次:" class="my-select my-first">
               <el-select v-model="splitForm.shiftId" placeholder="请选择班次">
@@ -368,14 +372,10 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :offset="2" :span="6">
-            <!-- 选择工艺 -->
-            <el-form-item size="small" label="选择工艺:" class="my-select my-first">
-              <el-select v-model="splitForm.routeCode" placeholder="请选择工艺">
-                <el-option v-for="item in routes" :key="item.routeCode" :label="item.routeName"
-                           :value="item.routeCode"
-                ></el-option>
-              </el-select>
+          <el-col :offset="1" :span="7">
+            <!-- 拆分数量 -->
+            <el-form-item size="small" label="拆分数量:">
+              <el-input required type="number" @input="splitNumChange" v-model="splitForm.splitNum"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -388,7 +388,7 @@
             </el-form-item>
           </el-col>
           <!-- 批次数量 -->
-          <el-col :offset="1" :span="4">
+          <el-col :offset="1" :span="7">
             <el-form-item size="small" label="批次数量">
               <el-input required @input="inBatch" type="number" v-model="item.batchQuantity"></el-input>
             </el-form-item>
@@ -435,6 +435,9 @@
 
 <script>
 import {
+  getProEquipment,
+  getProRoutes,
+  getProShifts,
   getWorkOrderList,
   getOrderList,
   subSplitOrder,
@@ -569,6 +572,22 @@ export default {
     })
   },
   methods: {
+    // 选择工艺
+    changeRoute(routeCode) {
+      getProEquipment(routeCode).then(response => {
+        this.proline = response.data
+      })
+    },
+    // 选择线体改变
+    changeEquipment(){
+      if (this.splitForm.routeCode == null) {
+        this.$message({
+          message: '请先选择工艺！',
+          type: 'warning'
+        })
+        return
+      }
+    },
     // 新增-订单数量改变
     addQuantity(num){
       if (num<=0){
@@ -642,11 +661,14 @@ export default {
       })
       //初始化日期为默认今天
       this.splitForm.productDate = new Date()
-      //获取成型机和班次
-      getprodLineShift(row.orderType).then(response => {
-        this.proline = response.data.lines
-        this.workShift = response.data.shifts
-        this.routes = response.data.routes
+
+      // 获取班次信息
+      getProShifts().then(response => {
+        this.workShift = response.data
+      })
+      // 获取工艺信息
+      getProRoutes(row.prodCode).then(response => {
+        this.routes = response.data
       })
 
       this.workerLoading = true // 设置加载状态为true，表示正在加载
@@ -848,7 +870,7 @@ export default {
       }
       if (this.splitForm.prodLineCode == null) {
         this.$message({
-          message: '请选择机型！',
+          message: '请选择线体！',
           type: 'warning'
         })
         return
diff --git a/src/views/plan/plan/index.vue b/src/views/plan/plan/index.vue
index 47bc2e8..97c8f78 100644
--- a/src/views/plan/plan/index.vue
+++ b/src/views/plan/plan/index.vue
@@ -549,7 +549,6 @@ export default {
         })
         return
       }
-      return
       // 数据校验班次冲突问题
       if (this.checkSelect === false) {
         this.$message({
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index d42ef95..bfb4cc2 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -320,22 +320,26 @@
         <!-- 编辑框 -->
         <!-- 第一行 -->
         <el-row>
-          <!-- 选择产线 -->
-          <el-col :span="6">
-            <el-form-item label="选择机型:">
-              <el-select @change="machineType" size="small" v-model="splitForm.prodLineCode" placeholder="请选择成型机">
-                <el-option v-for="item in proline" :key="item.key" :label="item.label" :value="item.key"></el-option>
+          <el-col :span="7">
+            <!-- 选择工艺 -->
+            <el-form-item size="small" label="选择工艺:" class="my-select my-first">
+              <el-select @change="routeChange" v-model="splitForm.routeCode" placeholder="请选择工艺">
+                <el-option v-for="item in routes" :key="item.routeCode" :label="item.routeName"
+                           :value="item.routeCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- 拆分数量 -->
-          <el-col :offset="2" :span="7">
-            <el-form-item size="small" label="拆分数量:">
-              <el-input required type="number" @input="splitNumChange" v-model="splitForm.splitNum"></el-input>
+          <el-col :offset="1" :span="7">
+            <!-- 选择产线 -->
+            <el-form-item label="选择线体:">
+              <el-select @change="machineType" size="small" v-model="splitForm.prodLineCode" placeholder="请选择线体">
+                <el-option v-for="item in proline" :key="item.key" :label="item.label" :value="item.key"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
-          <!-- 工单日期 -->
           <el-col :offset="1" :span="5">
+            <!-- 工单日期 -->
             <el-form-item size="small" label="工单日期: ">
               <el-date-picker value-format="yyyy-MM-dd" @change="checkDate" v-model="splitForm.productDate" type="date" placeholder="选择日期"
               ></el-date-picker>
@@ -344,7 +348,7 @@
         </el-row>
         <!-- 第二行 -->
         <el-row>
-          <el-col :span="6">
+          <el-col :span="7">
             <!-- 选择班次 -->
             <el-form-item size="small" label="选择班次:" class="my-select my-first">
               <el-select @change="shiftChange" v-model="splitForm.shiftId" placeholder="请选择班次" clearable>
@@ -355,21 +359,12 @@
                   :value="dict.value"
                 />
               </el-select>
-<!--              <el-select @change="shiftChange" v-model="splitForm.shiftId" placeholder="请选择班次">-->
-<!--                <el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"-->
-<!--                           :value="item.shiftId"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
             </el-form-item>
           </el-col>
-          <el-col :offset="2" :span="6">
-            <!-- 选择工艺 -->
-            <el-form-item size="small" label="选择工艺:" class="my-select my-first">
-              <el-select @change="routeChange" v-model="splitForm.routeCode" placeholder="请选择工艺">
-                <el-option v-for="item in routes" :key="item.routeCode" :label="item.routeName"
-                           :value="item.routeCode"
-                ></el-option>
-              </el-select>
+          <el-col :offset="1" :span="7">
+            <!-- 拆分数量 -->
+            <el-form-item size="small" label="拆分数量:">
+              <el-input required type="number" @input="splitNumChange" v-model="splitForm.splitNum"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -382,7 +377,7 @@
             </el-form-item>
           </el-col>
           <!-- 批次数量 -->
-          <el-col :offset="1" :span="4">
+          <el-col :offset="1" :span="7">
             <el-form-item size="small" label="批次数量">
               <el-input required @input="inBatch" type="number" v-model="item.batchQuantity"></el-input>
             </el-form-item>
@@ -443,7 +438,7 @@ import {
   checkWorkOrder
 } from '@/api/plan/workorder'
 import moment from 'moment';
-import { getprodLineShift } from '@/api/plan/order'
+import { getprodLineShift, getProEquipment, getProRoutes, getProShifts } from '@/api/plan/order'
 export default {
 	name: "Workorder",
 	dicts: ['product_type','workorder_type','shift_type'],
@@ -579,6 +574,17 @@ export default {
 		this.getList();
 	},
 	methods: {
+    // 选择线体改变
+    changeEquipment(){
+      if (this.splitForm.routeCode == null) {
+        this.$message({
+          message: '请先选择工艺！',
+          type: 'warning'
+        })
+        return
+      }
+    },
+    // 打印
     handlePrint(params) {
       printJS({
         printable: params.printable, // 'printFrom', // 标签元素id
@@ -681,6 +687,9 @@ export default {
     },
     /** 更改工艺 */
     routeChange(e){
+      getProEquipment(e).then(response => {
+        this.proline = response.data
+      })
       this.workForm.routeCode = e
     },
     /** 更改班次 */
@@ -861,11 +870,16 @@ export default {
 
           //初始化日期为默认今天
           this.splitForm.productDate = new Date()
-          //获取成型机和班次
-          getprodLineShift(this.selectWork.prodType).then(response => {
-            this.proline = response.data.lines
-            this.workShift = response.data.shifts
-            this.routes = response.data.routes
+          // 获取班次信息
+          getProShifts().then(response => {
+            this.workShift = response.data
+          })
+          // 获取工艺信息
+          getProRoutes(this.selectWork.productCode).then(response => {
+            this.routes = response.data
+            getProEquipment(this.selectWork.routeCode).then(response => {
+              this.proline = response.data
+            })
           })
           // 获取批次信息list
           getWorkBatchList(this.selectWork).then(response => {

From 50601615c7d0e6f1416d2ae00a5ac1c325629dd9 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 30 Aug 2023 16:56:00 +0800
Subject: [PATCH 23/23] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97(?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/workorder/index.vue | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index bfb4cc2..80c9d47 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -153,24 +153,25 @@
 		</el-row>
 
 		<el-table v-loading="loading" :data="workorderList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center" >
+			<el-table-column type="selection" align="center" >
 
 			</el-table-column>
 			<el-table-column label="工单ID" align="center" prop="workorderId" v-if="false"/>
-			<el-table-column label="子工单编码" align="center" prop="workorderCode" width="180"/>
+			<el-table-column width="150" label="子工单编号" align="center" prop="workorderCode"/>
 			<el-table-column label="工单名称" align="center" prop="workorderName" v-if="false"/>
 			<el-table-column label="订单id" align="center" prop="orderId" v-if="false"/>
-			<el-table-column label="子订单编码" align="center" prop="orderCode" width="160"/>
+			<el-table-column width="150" label="子订单编码" align="center" prop="orderCode"/>
 			<el-table-column label="产品ID" align="center" prop="productId" v-if="false"/>
-			<el-table-column label="产品编号" align="center" prop="productCode" width="160"/>
-			<el-table-column label="产品名称" align="center" prop="productName" width="160"/>
+			<el-table-column width="180" label="产品编码" align="center" prop="productCode"/>
+			<el-table-column width="300" label="产品名称" align="center" prop="productName"/>
 			<el-table-column label="规格型号" align="center" prop="productSpc" v-if="false"/>
-			<el-table-column label="单位" align="center" prop="unit" />
-			<el-table-column label="已生产数量" align="center" prop="quantityProduced" width="100"/>
-			<el-table-column label="已拆分数量" align="center" prop="quantitySplit" width="100"/>
-			<el-table-column label="工艺编码" align="center" prop="routeCode" />
-			<el-table-column label="产线设备" align="center" prop="prodLineCode" />
-			<el-table-column label="工单生产日期" align="center" prop="productDate" width="180">
+			<el-table-column width="50" label="单位" align="center" prop="unit" />
+			<el-table-column width="120" label="已生产数量" align="center" prop="quantityProduced"/>
+			<el-table-column width="120" label="派工数量" align="center" prop="quantitySplit"/>
+			<el-table-column width="150" label="工艺编码" align="center" prop="routeCode" />
+			<el-table-column width="150" label="工艺名称" align="center" prop="routeName" />
+			<el-table-column width="130" label="产线设备" align="center" prop="prodLineCode" />
+			<el-table-column width="120" label="工单生产日期" align="center" prop="productDate">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
 				</template>