From e8cd8586d5241def5b7eb490d083db95bccd5a51 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 27 Nov 2023 17:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request2.js                              |  13 ++
 pages/issue/coms/comIssueRequestCreator.vue  |   9 +-
 pages/issue/coms/comIssueRequestPopup.vue    | 150 +++++++++++++++++--
 pages/issue/request/issueRequestSubmit.vue   |   3 +
 pages/purchaseReturn/record/returnRecord.vue |  67 +++++++--
 pages/putaway/record/putawayRecord.vue       |   4 +
 6 files changed, 214 insertions(+), 32 deletions(-)

diff --git a/api/request2.js b/api/request2.js
index 46c45982..4cc6b412 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -360,6 +360,19 @@ export function getProductionlineItem(params) {
 	});
 }
 
+/**
+ * 查询生产线-车间-工位
+ * @param {*}   
+ * 
+ */
+export function getWorkShopLineStation() {
+	return request({
+		url: baseApi + "/wms/issue-request-main/get-workshop-productionline-workstation" ,
+		method: "get",
+		data: {},
+	});
+}
+
 
 
 
diff --git a/pages/issue/coms/comIssueRequestCreator.vue b/pages/issue/coms/comIssueRequestCreator.vue
index d7e4fd0d..92c3727d 100644
--- a/pages/issue/coms/comIssueRequestCreator.vue
+++ b/pages/issue/coms/comIssueRequestCreator.vue
@@ -7,16 +7,13 @@
 				<template v-slot:title>
 					<view class="" style="font-size: 32rpx;">
 						<view class="" >
-							车间代码 : {{dataContent.workShopCode}}
-						</view>
-						<view class="" >
-							车间名称 :
+							车间 : {{dataContent.workShopName}} ({{dataContent.workShopCode}})
 						</view>
 						<view class="">
-							生产线代码 :{{dataContent.productionLineCode}}
+							生产线 : {{dataContent.productionLineName}}({{dataContent.productionLineCode}})
 						</view>
 						<view class="">
-							工位代码 :{{dataContent.workStationCode}}
+							工位 : {{dataContent.workStationName}} ({{dataContent.workStationCode}})
 						</view>
 					</view>
 					
diff --git a/pages/issue/coms/comIssueRequestPopup.vue b/pages/issue/coms/comIssueRequestPopup.vue
index 7c52e31c..d97f3f66 100644
--- a/pages/issue/coms/comIssueRequestPopup.vue
+++ b/pages/issue/coms/comIssueRequestPopup.vue
@@ -19,7 +19,7 @@
 									<view class="" style="margin-left: 20rpx;">
 										{{positionInfo}}
 									</view>
-									<u-select v-model="show" mode="mutil-column-auto" :list="list"
+									<u-select v-model="show" mode="mutil-column-auto" :list="positionList"
 										@confirm="confirmSelect"></u-select>
 								</view>
 
@@ -70,7 +70,8 @@
 	import {
 		getBasicLocationByCode,
 		getBasicItemByCode,
-		getProductionlineItem
+		getProductionlineItem,
+		getWorkShopLineStation
 	} from '@/api/request2.js';
 	import {
 		getLocationTypeName,
@@ -93,9 +94,13 @@
 		data() {
 			return {
 				// itemCode: 'CE115F11161AG',
-				workShopCode: "",
-				productionLineCode: "",
-				workStationCode: "",
+				workShopCode: "", //车间
+				workShopName: "",
+				productionLineCode: "",//生产线
+				productionLineName:"",
+				workStationCode: "",//工位
+				workStationName:"",
+				
 				itemCode: '',
 				itemName: "",
 				qty: 0,
@@ -110,6 +115,102 @@
 				positionInfo: "请选择位置",
 				show: false,
 				isModifiedPosition: true,
+				positionList:[
+    {
+        "children": [
+            {
+                "children": [
+                    {
+                        "label": "",
+                        "value": ""
+                    }
+                ],
+                "label": "生产线1",
+                "value": "111"
+            }
+        ],
+        "label": "车间1",
+        "value": "111"
+    },
+    {
+        "children": [
+            {
+                "children": [
+                    {
+                        "label": "测试",
+                        "value": "测试111"
+                    }
+                ],
+                "label": "222",
+                "value": "222"
+            }
+        ],
+        "label": "333",
+        "value": "222"
+    },
+    {
+        "children": [
+            {
+                "children": [
+                    {
+                        "label": "",
+                        "value": ""
+                    }
+                ],
+                "label": "",
+                "value": ""
+            }
+        ],
+        "label": "3333",
+        "value": "333"
+    },
+    {
+        "children": [
+            {
+                "children": [
+                    {
+                        "label": "",
+                        "value": ""
+                    }
+                ],
+                "label": "",
+                "value": ""
+            }
+        ],
+        "label": "测试1111",
+        "value": "测试111"
+    },
+    {
+        "children": [
+            {
+                "children": [
+                    {
+                        "label": "工位1",
+                        "value": "station1"
+                    },
+                    {
+                        "label": "工位2",
+                        "value": "station2"
+                    }
+                ],
+                "label": "车间1-生产线1",
+                "value": "line1"
+            },
+            {
+                "children": [
+                    {
+                        "label": "",
+                        "value": ""
+                    }
+                ],
+                "label": "车间1-生产线2",
+                "value": "line2"
+            }
+        ],
+        "label": "车间1",
+        "value": "work1"
+    }
+],
 				list: [{
 						value: 1,
 						label: '车间1',
@@ -184,6 +285,14 @@
 		},
 		methods: {
 			openRequestPopup(editPosition) {
+				if(this.positionList.length==0){
+					getWorkShopLineStation().then(res=>{
+						// this.positionList =res
+					}).catch(error=>{
+						
+					})
+				}
+				
 				this.editPosition = editPosition;
 				if (this.isModifiedPosition) {
 					this.isModifiedPosition = false
@@ -208,9 +317,8 @@
 					this.showErrorMessage("请先选择位置")
 					return
 				}
-				this.$refs.selectList.queryList("111dsda")
-				// this.refs.selectList
-				// this.getItemCodeListByProLine("111")
+				this.$refs.selectList.queryList(this.productionLineCode)
+				
 			},
 
 			itemCodeGetFocus() {
@@ -262,9 +370,12 @@
 			callback(action) {
 				let item = {
 					positionInfo: this.positionInfo,
-					workShopCode: this.workShopCode,
-					productionLineCode: this.productionLineCode,
-					workStationCode: this.workStationCode,
+					workShopCode: this.workShopCode,//车间
+					workShopName: this.workShopName,
+					productionLineCode: this.productionLineCode,//生产线
+					productionLineName:this.productionLineName,
+					workStationCode: this.workStationCode,//工位
+					workStationName:this.workStationName,
 					itemCode: this.itemCode,
 					itemName: this.itemName,
 					uom: this.uom,
@@ -305,12 +416,19 @@
 
 			},
 			confirmSelect(e) {
+				
 				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
-				// this.productionLineCode =e[1].label;
-				// this.getItemCodeListByProLine(lineCode)
-				this.workShopCode = e[0].label
-				this.productionLineCode = e[1].label
-				this.workStationCode = e[2].label
+				var positionInfoValue = e[0].value + "-" + e[1].value + "-" + e[2].value
+				console.log("位置",this.positionInfo)
+				console.log("位置value",positionInfoValue)
+				this.workShopCode = e[0].value
+				this.productionLineCode = e[1].value
+				this.workStationCode = e[2].value
+				this.workShopName= e[0].label
+				this.productionLineName = e[1].label
+				this.workStationName = e[2].label
+				
+				
 
 			},
 			getItemCodeListByProLine(lineCode) {
diff --git a/pages/issue/request/issueRequestSubmit.vue b/pages/issue/request/issueRequestSubmit.vue
index 8ea1a289..10915c8b 100644
--- a/pages/issue/request/issueRequestSubmit.vue
+++ b/pages/issue/request/issueRequestSubmit.vue
@@ -92,8 +92,11 @@
 				if (this.detailSource.subList.length == 0) {
 					this.detailSource = {
 						workShopCode: item.workShopCode,
+						workShopName: item.workShopName,
 						productionLineCode:item.productionLineCode,
+						productionLineName:item.productionLineName,
 						workStationCode:item.workStationCode,
+						workStationName: item.workStationName,//工位
 						subList: []
 					}
 					var subItem = {
diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue
index 0a2cebe2..09f7ffa0 100644
--- a/pages/purchaseReturn/record/returnRecord.vue
+++ b/pages/purchaseReturn/record/returnRecord.vue
@@ -53,6 +53,10 @@
 		createDetailInfo,
 		calcHandleQty
 	} from '@/common/record.js';
+	
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
@@ -221,6 +225,8 @@
 					var params = this.setParams();
 					console.log("提交参数", JSON.stringify(params));
 					if (this.fromType == "requestType") {
+						var params = this.setParams(false)
+						console.log("提交" + JSON.stringify(params))
 						// purchaseReturnRequestSubmit(params).then(res => {
 						// 	uni.hideLoading()
 						// 	if (res.data) {
@@ -233,11 +239,40 @@
 						// 	this.showErrorMessage(error)
 						// })
 					} else {
+						
+						var itemCodes = []
+						this.detailSource.forEach(item => {
+							itemCodes.push(item.itemCode)
+						})
+						
+						//获取管理模式，封装参数
+						getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+							if (res.success) {
+								this.managementList = res.list;
+								var params = this.setParams(true)
+								console.log("提交参数", JSON.stringify(params));
+						
+								// putawayRecordSubmit(params).then(res => {
+								// 	uni.hideLoading()
+								// 	if (res.data) {
+								// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data )
+								// 	} else {
+								// 		this.showErrorMessage("提交失败"+res.msg)
+								// 	}
+								// }).catch(error => {
+								// 	uni.hideLoading()
+								// 	this.showErrorMessage(error)
+								// })
+							} else {
+								uni.hideLoading();
+								this.showErrorMessage(res.message);
+							}
+						});
 
 						// purchaseReturnRecordSubmit(params).then(res => {
 						// 	uni.hideLoading()
 						// 	if (res.data) {
-						// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, )
+						// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data )
 						// 	} else {
 						// 		this.showErrorMessage("提交失败"+res.msg)
 						// 	}
@@ -253,23 +288,35 @@
 			},
 
 
-			setParams() {
+			setParams(queryModel) {
 				var subList = []
 				var creator = this.$store.state.user.id
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
-							var subItem = {};
-							Object.assign(subItem, detail)
-							subItem.package =""
-							subList.push(subItem)
+							if (queryModel) {
+								var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+									detail.packingNumber, detail.batch);
+								detail.toPackingNumber = info.packingNumber;;
+								detail.toContainerNumber = detail.containerNumber
+								detail.toBatch = info.batch;
+								detail.toInventoryStatus = detail.inventoryStatus
+								detail.toLocationCode = this.toLocationCode
+							} else {
+								detail.toPackingNumber = detail.packingNumber;
+								detail.toContainerNumber = detail.containerNumber
+								detail.toBatch = detail.toBatch;
+								detail.toInventoryStatus = detail.inventoryStatus
+								detail.toLocationCode = ""
+							}
+			
+							subList.push(detail)
 						}
 					})
 				})
-				this.submitMainContent.subList = subList
-				this.submitMainContent.creator = creator;
-
-				return this.submitMainContent;
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
 			},
 
 			showMessage(message) {
diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue
index b14c46c0..49a5ea04 100644
--- a/pages/putaway/record/putawayRecord.vue
+++ b/pages/putaway/record/putawayRecord.vue
@@ -68,6 +68,10 @@
 		createDetailInfo,
 		calcHandleQty
 	} from '@/common/record.js';
+	
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'