From acf7a8e8abf9b484a9db7c2e35d5208bfca8db43 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 19 Jul 2024 11:25:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=AE=8C=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                           |  41 +-
 src/common/basic.js                           |  14 +
 src/common/scan.js                            |  29 ++
 src/common/style/new_style.css                |  10 +
 src/mycomponents/scan/winComScanFg.vue        |   1 +
 src/pages/fg/coms/comReceiptPopup.vue         |  92 ++--
 src/pages/fg/receiptByPlan.vue                | 490 ++++++++++++++----
 .../repleinsh/coms/comRepleinshJobCard.vue    |   2 +-
 src/pages/repleinsh/job/repleinshJob.vue      |   4 +-
 9 files changed, 536 insertions(+), 147 deletions(-)
 create mode 100644 src/common/scan.js

diff --git a/src/api/request2.js b/src/api/request2.js
index 9f5389f7..f7fb70e6 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -4251,18 +4251,55 @@ export  function getPlaneInfoByproductLine(productionLine,planDate) {
 }
 
 /**
- * 按
+ * 按计划完工提交
  * @param {*}  
  */
 
 export  function planReceiptSubmit(params) {
 	return  request({
-		url: baseApi + "/wms/production-main/getPlanProductionByProductionLineAndPlanDate",
+		url: baseApi + "/wms/productreceipt-record-main/createByPlan",
 		method: "post",
 		data:params
 	});
 }
 
+/**
+ * @param {Object} params 创建计划完工后调用上架申请 number
+ */
+export  function createPutawayRequestByPlan(number) {
+	return  request({
+		url: baseApi + "/wms/productreceipt-record-main/createPutawayRequest?number="+number,
+		method: "post",
+		data:{}
+	});
+}
+
+/**
+ * @param {Object} params 创建检验申请 number
+ */
+export  function createInspectRequestByPlan(number) {
+	return  request({
+		url: baseApi + "/wms/productreceipt-record-main/createInspectRequest?number="+number,
+		method: "post",
+		data:{}
+	});
+}
+
+
+/**
+ * @param {Object} params 查询计划报工单号 number
+ */
+export  function getPlanByNumber(params) {
+	return  request({
+		url: baseApi + "/wms/production-detail/senior",
+		method: "post",
+		data:params
+	});
+}
+
+
+
+//查询生产线
 export function getProductionlineAndWorkStation() {
 	return request({
 		url: baseApi + "/wms/production-main/getProductionlineAndWorkStation",
diff --git a/src/common/basic.js b/src/common/basic.js
index 93bc8860..3a7f4b54 100644
--- a/src/common/basic.js
+++ b/src/common/basic.js
@@ -904,6 +904,16 @@ export function dateFormat(time) {
 
 	return result;
 }
+//2024-07-19
+export function dateFormatData(time) {
+	var result = ""
+	if (time != null) {
+		let date = new Date(time);
+		result = getDate(date);
+	}
+
+	return result;
+}
 
 //获取日期部分
 export function getDate(date) {
@@ -1076,4 +1086,8 @@ export function deepCopyData(target) {
 	}
 
 	return cloneTarget;
+}
+//数组去重重复数据
+export function uniqueArray(arr) {
+  return arr.filter((item, index, self) => self.indexOf(item) === index);
 }
\ No newline at end of file
diff --git a/src/common/scan.js b/src/common/scan.js
new file mode 100644
index 00000000..d4ddbfdb
--- /dev/null
+++ b/src/common/scan.js
@@ -0,0 +1,29 @@
+import {
+	getLabelInfo
+} from '@/common/label.js';
+
+// export function getLabelInfoResult(scanMsg, headerType callBackInfo) {
+// 	let index = scanMsg.indexOf('\n');
+// 	if (index >= 0) {
+// 		// let content = uni.$u.trim(scanMsg)
+// 		let content = scanMsg
+// 		if (content == "") {
+// 			return ""
+// 		}
+
+// 		getLabelInfo(content, headerType, callback => {
+// 			let scanResult = callback;
+// 			scanResult.scanMessage = content
+// 			if (scanResult.success) {
+// 				return scanResult
+// 			} else {
+// 				return ""
+// 			}
+// 		});
+
+// 	}
+// }
+
+export function getLabelInfoResult(){
+	
+}
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 20b73a36..41120cb1 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2463,6 +2463,16 @@ button[disabled] {
 	width: 180rpx;
 }
 
+.btn_single_clear {
+	background-color: #EBEEF0;
+	font-size: 30rpx;
+	color: #000;
+	text-align: center;
+	width: 180rpx;
+}
+
+
+
 .btn_single_reject {
 	background-color: #F56C6C;
 	font-size: 30rpx;
diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue
index d1445390..531c5a36 100644
--- a/src/mycomponents/scan/winComScanFg.vue
+++ b/src/mycomponents/scan/winComScanFg.vue
@@ -188,6 +188,7 @@
 						getMesPackInfo(this.itemCode).then(res => {
 							try {
 								if (res.data.list.length == 0) {
+									that.clear();
 									throw new Error("没有查找到物料号【" + this.itemCode + "】对应的生产条码配置")
 								}
 								var result = res.data.list[0] //Mes条码标签解析规格
diff --git a/src/pages/fg/coms/comReceiptPopup.vue b/src/pages/fg/coms/comReceiptPopup.vue
index 7274125c..f6ad6dfd 100644
--- a/src/pages/fg/coms/comReceiptPopup.vue
+++ b/src/pages/fg/coms/comReceiptPopup.vue
@@ -49,14 +49,13 @@
 
 							<view class="title " style="display: flex;align-items: center;padding: 10rpx;">
 								<text style=" flex-shrink: 0; width: 25%;">批次：</text>
-								<uni-easyinput v-model="batch"></uni-easyinput>
+								<uni-easyinput v-model="batch" ></uni-easyinput>
 								<view class="">
 									<image src="" mode="" style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;"
 										@click="showSelectLine">
 									</image>
 								</view>
 							</view>
-							<view class='split_line'></view>
 							<!-- <view class="title " style="display: flex;align-items: center;padding: 10rpx;">
 								<text style=" flex-shrink: 0; width: 25%;">计划数量：</text>
 								<view class="customerBorder">
@@ -71,9 +70,9 @@
 							<view class="title " style="display: flex;align-items: center;padding: 10rpx;">
 								<text style=" flex-shrink: 0; width: 25%;">包装规格：</text>
 								<view class="customerBorder">
-									{{packUnit}}
+									{{packUnitName}}
 								</view>
-								<u-select v-model="showPackUnitSelect" mode="mutil-column" :list="packUnitList"
+								<u-select v-model="showPackUnitSelect" mode="single-column" :list="packUnitList"
 									@confirm="confirmSelectPackUnit"></u-select>
 								<view class="">
 									<image src="/static/icons/down.svg" mode=""
@@ -111,8 +110,13 @@
 
 	import {
 		getCurrDate,
-		getBatch8
+		getBatch8,
+		dateFormatData
 	} from '@/common/basic.js';
+	
+	import {
+		calc
+	} from '@/common/calc.js';
 
 	import uom from '@/mycomponents/qty/uom.vue'
 	import packQty from '@/mycomponents/qty/packQty.vue'
@@ -130,19 +134,25 @@
 			return {
 				itemCode: '请选择物料信息',
 				uom: "",
+				qty:null,
 				planQty: 0,
-				number: "",
+				goodQty:0,
+				planNumber: "",
 				productLineCode: "",
 				showProductLineSelect: false,
 				productLineList: [],
 				productionLineName: "请选择生产线",
 				productionLineCode: "",
 				batch: "",
-				packUnit: "请选择包装规格",
+				packUnitName: "请选择包装规格",
+				packUnit :"",
+				packUnitList: [],
+				packQtyHint:"",
+				packQty:0,
 				showPackUnitSelect: false,
 				itemCodeList: [],
 				showItemCodeSelect: false,
-				packUnitList: [],
+				workStationCode:""
 			}
 		},
 		props: {
@@ -165,18 +175,23 @@
 				this.itemCode = '请选择物料信息';
 				this.uom = ""
 				this.planQty = 0
-				this.number = ""
+				this.goodQty =0;
+				this.packQty=0;
+				this.planNumber = ""
 				this.productLineCode = ""
 				this.showProductLineSelect = false
 				this.productLineList = []
 				this.productionLineName = "请选择生产线"
 				this.productionLineCode = ""
 				this.batch = ""
-				this.packUnit = "请选择包装规格"
+				this.packUnitName = "请选择包装规格"
+				this.packUnit ="",
+				this.packQtyHint =""
 				this.showPackUnitSelect = false
 				// this.packUnitList = []
 				this.itemCodeList = []
 				this.showItemCodeSelect = false
+				this.workStationCode=""
 
 			},
 
@@ -203,7 +218,7 @@
 					return
 				}
 
-				if (this.itemCode == "请选择包装规格") {
+				if (this.packUnitName == "请选择包装规格") {
 					this.showErrorMessage("请选择包装规格")
 					return
 				}
@@ -216,12 +231,17 @@
 					productionLineName: this.productionLineName,
 					productionLineCode: this.productionLineCode, //生产线
 					itemCode: this.itemCode,
-					uom: this.uom,
+					uom: this.getUomInfo(this.uom),
 					batch: this.batch,
-					packUnit: "packUnit",
+					packUnitName: this.packUnitName,
+					packUnit:this.packUnit,
+					packQtyHint:this.packQtyHint,
+					packQty:this.packQty,
 					planQty: this.planQty,
-					number: this.number
-
+					goodQty:this.goodQty,
+					planNumber: this.planNumber,
+					workStationCode:this.workStationCode
+				
 				};
 				this.closeRequestPopup();
 				this.$emit("confirm", item);
@@ -237,8 +257,9 @@
 			},
 
 			confirmSelectLine(data) {
-				this.productionLineName = data[0].label
+				this.productionLineName = data[0].label+"—"+data[1].label
 				this.productionLineCode = data[0].value
+				this.workStationCode = data[1].value
 			},
 
 			showSelectLine() {
@@ -250,9 +271,6 @@
 					getProductionlineAndWorkStation().then(res => {
 						uni.hideLoading()
 						if (res.data && res.data.length > 0) {
-							// res.data.forEach(item => {
-							// 	item.label = item.name
-							// })
 							this.productLineList = res.data
 							this.showProductLineSelect = true
 						} else {
@@ -274,8 +292,6 @@
 					this.showErrorMessage('请先选择生产线');
 					return;
 				}
-
-				if (this.itemCodeList.length == 0) {
 					console.log("当天", getCurrDate())
 					uni.showLoading({
 						title: "加载中",
@@ -285,7 +301,7 @@
 						uni.hideLoading()
 						if (res.data && res.data.length > 0) {
 							res.data.forEach(item => {
-								item.label = item.itemCode + "（" + item.planQty + item.uom + ")"
+								item.label = item.itemCode + "（" + item.planQty + item.uom + ")"+"("+dateFormatData(item.planDate)+")"
 								item.value = item
 							})
 							this.itemCodeList = res.data
@@ -298,27 +314,17 @@
 						uni.hideLoading()
 						this.showErrorMessage(error);
 					})
-				} else {
-					this.showItemCodeSelect = true
-				}
-
 			},
 			confirmSelectItem(data) {
 				let productionPlan = data[0].value;
 				this.itemCode = productionPlan.itemCode;
-				// var item = this.itemCodeList.find(res => res.itemCode == this.itemCode)
 				this.uom = productionPlan.uom
-				this.planQty = productionPlan.planQty
-				this.number = productionPlan.number
-				// this.itemCode = data[0].label
-				// var item = this.itemCodeList.find(res => res.itemCode == this.itemCode)
-				// this.uom = item.uom
-				// this.planQty = item.planQty
-				// this.number = item.number
+				this.planQty = productionPlan.planQty;
+				this.goodQty = productionPlan.goodQty
+				this.planNumber = productionPlan.number
 			},
 
 			showSelectPackUnit() {
-				if (this.packUnitList.length == 0) {
 					if (this.itemCode == "请选择物料信息") {
 						this.showErrorMessage('请先选择物料');
 						return;
@@ -336,7 +342,7 @@
 								item.label = getPackUnitName(item.packUnit) + "(" + item.packQty + this
 									.getUomInfo(item.uom) + ")";
 							})
-							// this.packUnitList = res.data.list
+							this.packUnitList = res.data.list
 							this.showPackUnitSelect = true
 						} else {
 							this.showErrorMessage('未查找到包装信息');
@@ -346,18 +352,16 @@
 						uni.hideLoading()
 						this.showErrorMessage(error);
 					})
-				} else {
-					this.showPackUnitSelect = true
-				}
 
 			},
 
 			confirmSelectPackUnit(data) {
-
-				let pack = this.packUnitList.filter(r => r.packUnit == data[0].value)[0];
-				// this.packUnit = pack.packQty;
-				this.packUnit = data[0].label
-
+				this.packUnitName = data[0].label
+				this.packUnit =data[0].value
+				let pack = this.packUnitList.filter(r => r.packUnit == this.packUnit);
+				this.packQtyHint = pack[0].packQty+"("+this
+					.getUomInfo(pack[0].uom)+")";
+				this.packQty =pack[0].packQty
 			},
 			getUomInfo(uom) {
 				let item = getUomInfo(uom);
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index 74f2d61a..c9a4e3b6 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -1,57 +1,95 @@
 <template>
 	<view class="page-wraper" style="background-color: #fff;">
-		<view class="">
-			<com-blank-view @goScan='openFg' v-if="!dataContent"></com-blank-view>
-		</view>
 
-		<view class="page-wraper" v-if="dataContent">
-			<view class="" style="font-size: 35rpx;padding: 10rpx; padding-left: 15rpx;">
-				生产计划：{{dataContent.number}}
-			</view>
-			<view class='split_line'></view>
+		<view class="header">
 			<view class="">
-				<item-qty :dataContent="dataContent" :isShowBalanceQty="false"></item-qty>
+				<com-blank-view @goScan='openFg' v-if="!dataContent"></com-blank-view>
 			</view>
-			<view class='split_line'></view>
-			<view class="" style="margin-left: 20rpx;">
-				<batch :batch="dataContent.batch"></batch>
-				<view class="card_view ">
-					<text style="color: #FFA500;padding: 5px;font-size: 35rpx;">包装规格</text>
-					<text class="card_content ">{{dataContent.packUnit}}</text>
+			<view class="" v-if="dataContent">
+				<view class="" style="font-size: 35rpx;padding: 10rpx; padding-left: 15rpx;">
+					生产计划：{{dataContent.planNumber}}
 				</view>
-			</view>
-			<view class='split_line'></view>
-			<view class="page-main">
-				<uni-swipe-action>
-					<view class="scan_view" v-for="(item, index) in dataContent.subList" :key="index">
-						<uni-swipe-action-item :right-options="options" @click="swipeClick($event,item,index)">
-							<view class="" style="margin-left: 40rpx; padding-top: 10rpx; padding-bottom: 10rpx;">
-								<text style="font-size: 35rpx;color: #B66463;">唯一码</text>
-								<text style="font-size: 35rpx;"> {{item.code}}</text>
-							</view>
-						</uni-swipe-action-item>
+				<view class='split_line'></view>
 
+				<view class="cell_box uni-flex uni-row">
+					<view class="cell_info">
+						<view class="text_lightblue">计划数</view>
+						<view>{{dataContent.planQty}}{{dataContent.uom}}</view>
 					</view>
-				</uni-swipe-action>
-			</view>
-			<view class="page-footer">
-				<view class="uni-flex u-col-center space-between padding_10"
-					style="background-color:ghostwhite; width: 100%; ">
-					<view class="">
-						<view class="uni-flex uni-row">
-						</view>
+					<view class="cell_info">
+						<view class="text_lightblue">已完工</view>
+						<view>{{ dataContent.goodQty }}{{dataContent.uom}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">未完工</view>
+						<view>{{dataContent.noGoodQty}}{{dataContent.uom}}</view>
+					</view>
+				</view>
+				<view class='split_line'></view>
 
+				<view class="" style="padding-top: 10rpx; padding-bottom: 10rpx; margin-left: 10rpx;">
+					<item :dataContent="dataContent"></item>
+				</view>
+				<view class='split_line'></view>
+				<view class="uni-flex uni-row space-between" style="align-items: center">
+					<view style="word-break: break-all;">
+						<batch :batch="dataContent.batch"></batch>
+						<view class="card_view ">
+							<text style="color: #FFA500;padding: 5px;font-size: 30rpx;">包装规格</text>
+							<text class="card_content ">{{dataContent.packUnit}} </text>
+						</view>
 					</view>
-					<view class=" uni-flex uni-row">
-						<button class="btn_single_clear" style="margin-right: 50rpx;" hover-class="btn_clear_after"
-							@click="clear">清空</button>
-						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					<view style="word-break: break-all; font-size: 35rpx; font-weight: bold;">
+						<text v-if="dataContent.handleQty>0" style="color: #FFA500;">{{dataContent.handleQty}}/</text>
+						{{dataContent.packQtyHint}}
 					</view>
+
+
 				</view>
+				<view class='split_line' v-if="dataContent"></view>
+
 			</view>
 
 
 		</view>
+
+
+		<view style="margin-top: 480rpx; padding-bottom: 160rpx;" v-if="dataContent">
+
+			<scroll-view scroll-y="true" class="">
+				<view class="scan_view" v-for="(item, index) in showList" :key="index">
+					<uni-swipe-action>
+						<uni-swipe-action-item :right-options="options" @click="swipeClick($event,item,index)">
+							<view class="uni-flex uni-row "
+								style="margin-left: 50rpx; padding-top: 10rpx; padding-bottom: 10rpx;">
+								<view class="auto-wrap" style="font-size: 35rpx;font-weight: bold; width: 100%;">
+									<text style="font-size: 30rpx;color: #B66463;">唯一码 </text>
+									{{item.content}}
+								</view>
+							</view>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line color="#D8D8D8"></u-line>
+				</view>
+
+			</scroll-view>
+			<uni-load-more :status="loadingType" v-if="showList.length>0" />
+
+		</view>
+		<view class="page-footer" v-if="dataContent">
+			<view class="uni-flex u-col-center space-between " style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<view class="uni-flex uni-row">
+					</view>
+
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_clear" hover-class="btn_commit_after" style="margin-right: 50rpx;"
+						@click="clear">清空</button>
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
 		<comReceiptPopup ref="comReceiptPopup" @confirm='requestConfirm'></comReceiptPopup>
 		<win-scan-button v-if="dataContent" @goScan='openScanPopup'></win-scan-button>
 		<win-scan-fg-label ref="scanPopup" @getResult='getScanResult' title='制品标签'></win-scan-fg-label>
@@ -62,32 +100,53 @@
 <script>
 	import {
 		isCheckMesCode,
-		planReceiptSubmit
+		planReceiptSubmit,
+		createPutawayRequestByPlan,
+		createInspectRequestByPlan,
+		getPlanByNumber
 	} from '@/api/request2.js';
 	import {
-		getRemoveOption
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getRemoveOption,
+		deepCopyData,
+		getCurrDateTime,
+		compare
 	} from '@/common/basic.js';
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
 	import comReceiptPopup from '@/pages/fg/coms/comReceiptPopup.vue'
-	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import item from '@/mycomponents/item/item.vue'
 	import batch from '@/mycomponents/balance/batch.vue'
 	import pack from '@/mycomponents/balance/pack.vue'
 	import winScanFgLabel from "@/mycomponents/scan/winScanFgLabel.vue"
+	import comFgCard from "@/pages/productReceipt/coms/comFgCard.vue"
+	import {
+		Exception
+	} from 'sass';
+
 	export default {
 		components: {
 			comBlankView,
 			comReceiptPopup,
-			itemQty,
+			item,
 			batch,
 			pack,
 			winScanButton,
-			winScanFgLabel
+			winScanFgLabel,
+			comFgCard
 		},
 		data() {
 			return {
 				dataContent: null,
-				options: []
+				options: [],
+				showList: [],
+				allList: [],
+				index: 1,
+				loadingType: "",
+				pageSize: 20
 
 			};
 		},
@@ -97,11 +156,29 @@
 			this.options = getRemoveOption()
 			this.openFg();
 		},
+		onReachBottom() {
+			console.log("onReachBottom")
+			//避免多次触发
+			if (this.loadingType == 'nomore') {
+				return;
+			}
+			this.index++;
+			var list = this.getDataPage(this.index, this.pageSize)
+			if (list.length > 0) {
+				// this.showList=list
+				this.showList = this.showList.concat(list)
+			} else {
+				//没有更多了
+				this.loadingType = "nomore";
+			}
+
+		},
 
 		mounted() {
 
 		},
 		methods: {
+
 			openFg() {
 				setTimeout(res => {
 					if (this.$refs.comReceiptPopup) {
@@ -113,115 +190,332 @@
 			requestConfirm(result) {
 				this.dataContent = {
 					itemCode: result.itemCode,
-					number: result.number, //计划单号
+					planNumber: result.planNumber, //计划单号
 					handleQty: 0,
-					qty: result.planQty,
-					batch: result.batch,
-					packUnit: "3031",
+					qty: 0,
+					planQty: result.planQty,
+					goodQty: result.goodQty,
+					noGoodQty: calc.sub(result.planQty, result.goodQty),
+					packQtyHint: result.packQtyHint,
+					packQty: result.packQty,
 					uom: result.uom,
-					subList: [{
-							code: "1234"
+					batch: result.batch,
+					packUnit: result.packUnit,
+					workStationCode: result.workStationCode,
+					subList: []
+				}
+			},
 
-						},
-						{
-							code: "12345"
+			initList() {
+				this.index = 1;
+				this.showList = []
+				this.loadingType = "";
+				this.showList = this.getDataPage(this.index, this.pageSize)
+			},
 
-						}
+			getDataPage(pageNo, pageSize) {
+				//计算总页数
+				var totalPages = Math.ceil(this.allList.length / pageSize);
+				//当前页起始索引
+				const start = (pageNo - 1) * pageSize;
+				const end = start + pageSize; //当前页结束索引
+				return this.allList.slice(start, end)
 
-					]
-				}
 			},
-			swipeClick(e, dataContent,index) {
+
+			swipeClick(e, dataContent, index) {
 				if (e.content.text == "移除") {
-					this.dataContent.subList.splice(index,1);
-				} 
+					this.$refs.comMessage.showQuestionMessage("是否要移除", res => {
+						if (res) {
+							this.allList.splice(index, 1);
+							this.initList()
+						}
+
+					})
+				}
 
 			},
-			commit() {
-				planReceiptSubmit(params).then(res => {
-					uni.hideLoading()
-					if (res.data) {
-						this.showCommitSuccessMessage(res.data)
+			async commit() {
+
+				if (this.allList.length == 0) {
+					this.showErrorMessage("请先扫描唯一码")
+					return;
+				}
+
+
+				try {
+
+					let params = this.setParams()
+					console.log(JSON.stringify(params))
+					uni.showLoading({
+						title: "提交中...",
+						mask: true
+					})
+					let list = []
+					var planData = await planReceiptSubmit(params)
+					if (planData.data) {
+
+						planData.data.forEach(item => {
+							list.push({
+								itemCode: item.itemCode, // 物品代码
+								itemName: item.itemName, // 物品名称
+								packName: item.packName, // 包装名称
+								packageCode: item.toPackingNumber, // 包装号
+								batch: item.toBatch, //批次
+								parentNumber: item.parentNumber, //父包装号
+								itemType: item.itemType, //物料类型
+								asnNumber: item.asnNumber, //ASN
+								supplierCode: item.supplierCode, // 供应商
+								qty: item.qty, // 数量
+								printTimes: getCurrDateTime(), // 打印时间
+								productionLineCode: item.productionLineCode, //生产线
+								barcodeString: item.barcodeString, // 标签信息
+								barcodeBase64: '',
+								requestNumber: item.requestNumber
+							})
+						})
 					} else {
-						this.showErrorMessage("提交失败[" + res.msg + "]")
+						throw new Error("提交失败")
+					}
+
+					 createPutawayRequestByPlan(list[0].requestNumber).then(res=>{
+						 createInspectRequestByPlan(list[0].requestNumber)
+					 })
+
+					var queryParams = {
+						filters: [{
+								column: "plan_type",
+								action: "==",
+								value: "assemble"
+							},
+							{
+								column: "number",
+								action: "==",
+								value: this.dataContent.planNumber
+							}
+						],
+						pageNo: 1,
+						pageSize: 100,
+					}
+					
+					var planeInfo = await getPlanByNumber(queryParams);
+					if (planeInfo.data && planeInfo.data.list.length > 0) {
+						if (planeInfo.data.list[0].goodQty >= planeInfo.data.list[0].planQty) {
+							this.clear();
+						} else {
+							this.dataContent.planNumber = planeInfo.data.list[0].number;
+							this.dataContent.handleQty = 0;
+							this.dataContent.planQty = planeInfo.data.list[0].planQty
+							this.dataContent.goodQty = planeInfo.data.list[0].goodQty
+							this.dataContent.noGoodQty = calc.sub(planeInfo.data.list[0].planQty, planeInfo.data.list[0].goodQty),
+							this.dataContent.subList = []
+							this.showList=[];
+							this.allList=[]
+							this.index=1
+						}
+
+					} else {
+						throw new Error("未查找到单据信息")
 					}
-				}).catch(error => {
 					uni.hideLoading()
-					this.showErrorMessage(error)
+					this.showCommitSuccessMessage("提交成功<br>生成报工记录<br>", list)
+
+				} catch (error) {
+					uni.hideLoading()
+					var hint = error.message ? error.message : error
+					this.showErrorMessage(hint)
+				}
+
+			},
+
+			setParams() {
+				this.allList.forEach(res => {
+					res.outsideItemCode = res.itemCode
+					res.outsideProduceDate = null
+					res.outsideSerialNumber = res.order
 				})
+				this.dataContent.subList = this.allList
+
+				return this.dataContent
 			},
+
 			clear() {
+				this.$refs.comMessage.showQuestionMessage("是否要清空?", res => {
+					if (res) {
+						this.clearData()
+						this.openFg();
+					}
 
+				})
 			},
+			clearData() {
+				this.dataContent = null
+				this.showList = []
+				this.allList = []
+				this.index = 1;
+			},
+
 			openScanPopup() {
 				var itemCode = this.dataContent.itemCode
-				// itemCode = "015553147"
 				console.log("物料", itemCode)
 				this.$refs.scanPopup.openScanPopup(itemCode);
 			},
 			getScanResult(result) {
-					let that = this;
+				let that = this;
 				//TODO缺少零件号的对应关系
 				//查询mes码是否完工
-				isCheckMesCode(result.content).then(res=>{
-					if(res.data){
+				isCheckMesCode(result.content).then(res => {
+					if (res.data) {
 						if (that.dataContent) {
-							let list = that.dataContent.subList; //应该按零件号查找
-							
-							var itemIndex = list.findIndex(r =>
+
+							var itemIndex = this.allList.findIndex(r =>
 								r.itemCode == result.itemCode &&
-								// r.productDate == result.productDate &&
 								r.order == result.order);
-								//不存在
+							//不存在
 							if (itemIndex == -1) {
-								list.push(result);
-								that.calcFgQty();
+								// if (this.allList.length > this.dataContent.packQty) {
+								// 	this.showErrorMessage("唯一码数量不能大于计划数量")
+								// 	return;
+								// }
+								result.countTime = new Date();
+								this.allList.push(result);
+								this.allList.sort(compare('countTime')); //按扫描信息排序
+								this.initList()
+								this.scanPopupGetFocus();
+								this.calcFgQty();
 							} else {
-								this.showErrorMessage("标签【" + result.content + '】已经扫描，是否移除', confirm => {
-									list.splice(itemIndex, 1)
-									that.calcFgQty();
-								})
+								this.$refs.comMessage.showQuestionMessage("唯一码【" + result.content +
+									'】已经扫描，是否移除',
+									res => {
+										if (res) {
+											this.allList.splice(itemIndex, 1)
+											this.allList.sort(compare('countTime')); //按扫描信息排序
+											this.initList()
+											that.calcFgQty();
+										}
+									})
 							}
-							setTimeout(r => {
-								this.scanPopupGetFocus();
-							}, 500)
-							
-							
 						}
 					}
-				}).catch(error=>{
+				}).catch(error => {
 					this.showErrorMessage(error)
 				})
-				
+
 			},
-			
+
 			calcFgQty() {
-				this.dataContent.handleQty =this.dataContent.subList.length;
-				if (this.dataContent.handleQty == this.dataContent.qty) {
+				this.dataContent.handleQty = this.allList.length;
+				if (this.dataContent.handleQty == this.dataContent.packQty) {
+					if (this.$refs.scanPopup) {
+						this.$refs.scanPopup.closeScanPopup();
+					}
 					this.commit()
 				}
 			},
-			
+
 			scanPopupGetFocus() {
 				if (this.$refs.scanPopup) {
 					this.$refs.scanPopup.getfocus();
 				}
 			},
 			scanPopupLoseFocus() {
-				if (this.$refs.scanPopup ) {
+				if (this.$refs.scanPopup) {
 					this.$refs.scanPopup.losefocus();
 				}
 			},
-			showCommitSuccessMessage(hint) {
+
+			showCommitSuccessMessage(hint, pointData) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.dataContent=null;
-					this.openFg();
+					if (pointData.length > 0) {
+						uni.navigateTo({
+							url: `/pages/point/index?points=${JSON.stringify(pointData)}`
+						});
+					}
+
 				})
 			},
+
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.scanPopupGetFocus()
+					}
+				});
+			}
 		}
 
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+	.header {
+		position: fixed;
+		/* #ifdef H5 */
+		top: 88rpx;
+		/* #endif */
+		left: 0;
+		width: 100%;
+		background-color: #fff;
+		z-index: 10;
+		padding: 10rpx;
+		/* 确保头部在内容之上 */
+	}
+
+	.page-footer {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+
+	.item {
+		background-color: #fff;
+	}
+
+	.item_scaned {
+		background-color: antiquewhite;
+	}
+
+	.auto-wrap {
+		white-space: normal;
+		word-break: break-all;
+		overflow-wrap: break-word;
+		/* 对于兼容性更好的情况 */
+	}
 </style>
\ No newline at end of file
diff --git a/src/pages/repleinsh/coms/comRepleinshJobCard.vue b/src/pages/repleinsh/coms/comRepleinshJobCard.vue
index 028ad3b6..216deb18 100644
--- a/src/pages/repleinsh/coms/comRepleinshJobCard.vue
+++ b/src/pages/repleinsh/coms/comRepleinshJobCard.vue
@@ -1,6 +1,6 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
-		<job-com-main-card  :dataContent="dataContent"></job-com-main-card>
+		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
 	</job-com-main-card>
 </template>
 
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index dd85e54b..0e01c08a 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -169,8 +169,8 @@
 					filters: filters,
 					pageNo: this.pageNo,
 					pageSize: this.pageSize,
-					sort: 'fromLocationCode',
-					by: 'asc'
+					sort: 'number',
+					by: 'desc'
 				}
 
 				getRepleinshJobList(params).then(res => {

From 21231e4b42995170e8d6253d040023ba3fe9aa7c Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 19 Jul 2024 19:20:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E8=A1=A5=E6=96=99=E3=80=81=E5=A4=87=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/issue/coms/comScanIssuePack.vue     |  6 +-
 .../repleinsh/coms/comScanReplishPack.vue     | 40 ++++++-----
 src/pages/repleinsh/job/repleinshJob.vue      |  6 +-
 src/pages/stockUp/coms/comScanStockUpPack.vue |  4 ++
 src/pages/stockUp/job/stockUpJobDetail.vue    | 71 +++++++++++--------
 5 files changed, 76 insertions(+), 51 deletions(-)

diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue
index 1e724626..56b9e4ec 100644
--- a/src/pages/issue/coms/comScanIssuePack.vue
+++ b/src/pages/issue/coms/comScanIssuePack.vue
@@ -116,6 +116,9 @@
 		getWorkShopLineStation,
 		getBalanceByFilter
 	} from '@/api/request2.js';
+	import {
+		uniqueArray
+	} from '@/common/basic.js';
 
 	import {
 		calc
@@ -242,7 +245,8 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 						})
 					})
 				});
-
+				//去掉重复库位
+				list = uniqueArray(list);
 				this.fromLocationCode = list[0];
 				return list;
 			},
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index 3e1ace89..37071994 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -109,6 +109,10 @@
 	import {
 		calc
 	} from '@/common/calc.js';
+	
+	import {
+		uniqueArray
+	} from '@/common/basic.js';
 
 	import {
 		getBalanceByManagementPrecision
@@ -153,7 +157,7 @@
 				defaultValueList: [],
 				label: {},
 				fromInventoryStatuses: "",
-				packageInfo:{}
+				packageInfo: {}
 			}
 		},
 		created() {
@@ -208,7 +212,10 @@
 							list.push(f.fromLocationCode)
 						})
 					})
+					//去掉重复库位
+					list = uniqueArray(list);
 					this.fromLocationCode = list[0];
+
 					return list;
 				} else {
 					this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => {
@@ -253,7 +260,7 @@
 						})
 
 						this.getBalance(result.label, packageInfo, balances => {
-							this.packageInfo =packageInfo;
+							this.packageInfo = packageInfo;
 							//扫描的是外包装
 							let s = '';
 							if (!result.package.parentNumber) {
@@ -282,38 +289,39 @@
 									//外包装库存
 									let subParentPackitems = balances.list.filter(r => r.packingNumber ==
 										packageInfo
-										.parentNumber&&r.locationCode==this.fromLocationCode)
+										.parentNumber && r.locationCode == this.fromLocationCode)
 
 
 									//小包装没有库存，
 									if (subPackitems.length == 0) {
 										//外包装有库存，出库后剩余库存未转换为出库包装规格
-										
+
 										if (subParentPackitems.length > 0) {
-											if(subParentPackitems.length==1){
+											if (subParentPackitems.length == 1) {
 												let balance = subParentPackitems[0];
-												balance.qty=packageInfo.qty;
+												balance.qty = packageInfo.qty;
 												this.afterGetBalance(result.label, balance, packageInfo);
-											}else {
+											} else {
 												this.showBalanceSelect(subParentPackitems);
 											}
-											
+
 										} else {
 											this.showErrorMessage('按外包装【' + packageInfo.parentNumber + '】和子包装【' +
 												packageInfo.number + '】都未查找到库存余额')
 										}
 									} else {
 										var locationCode = this.fromLocationCode
-										if(balances.list==1){
-											 locationCode=balances.list[0].locationCode
-										}else {
-											var manyBlances = balances.list.filter(r=>r.locationCode!=this.fromLocationCode)
-											if(manyBlances.length>0){
+										if (balances.list == 1) {
+											locationCode = balances.list[0].locationCode
+										} else {
+											var manyBlances = balances.list.filter(r => r.locationCode != this
+												.fromLocationCode)
+											if (manyBlances.length > 0) {
 												locationCode = manyBlances[0].locationCode;
 											}
-											
+
 										}
-										this.showErrorMessage('该包装【' + packageInfo.number + '】在库位【' + 
+										this.showErrorMessage('该包装【' + packageInfo.number + '】在库位【' +
 											locationCode +
 											'】已经有库存余额,请重新扫描')
 									}
@@ -411,7 +419,7 @@
 			},
 
 			selectBalanceItem(balance) {
-				this.afterGetBalance(this.label, balance,this.packageInfo);
+				this.afterGetBalance(this.label, balance, this.packageInfo);
 			},
 
 			afterGetBalance(label, balance, packageInfo) {
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index 0e01c08a..2c3a9ea3 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -287,13 +287,13 @@
 					filters: filters,
 					pageNo: 1,
 					pageSize: 100,
-					sort: 'fromLocationCode',
-					by: 'asc'
+					sort: 'number',
+					by: 'desc'
 				}
 				getRepleinshJobList(params).then(res => {
 					uni.hideLoading();
 					if (res.data.list.length == 0) {
-						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+						that.showMessage('未查找到' + '【' + code + '】的补料任务');
 					} else if (res.data.list.length == 1) {
 						that.openJobDetail(res.data.list[0]);
 					}
diff --git a/src/pages/stockUp/coms/comScanStockUpPack.vue b/src/pages/stockUp/coms/comScanStockUpPack.vue
index 4f09dcbf..5d72bcb0 100644
--- a/src/pages/stockUp/coms/comScanStockUpPack.vue
+++ b/src/pages/stockUp/coms/comScanStockUpPack.vue
@@ -345,6 +345,10 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 									'】的发货明细,是否要继续发货?', res => {
 										if (res) {
 											let batch = that.createBatchInfo(label, balance,packageInfo);
+											//新增加的批次赋值details
+											if (fromLocation.Batchs.length > 0) {
+												batch.detail = fromLocation.Batchs[0].detail;
+											}
 											fromLocation.Batchs.unshift(batch);
 										}
 									})
diff --git a/src/pages/stockUp/job/stockUpJobDetail.vue b/src/pages/stockUp/job/stockUpJobDetail.vue
index 64b9cd87..c9a40892 100644
--- a/src/pages/stockUp/job/stockUpJobDetail.vue
+++ b/src/pages/stockUp/job/stockUpJobDetail.vue
@@ -80,6 +80,7 @@
 		getCurrDateTime,
 		getDirectoryItemArray,
 		getPackingNumberAndBatch,
+		deepCopyData
 	} from '@/common/basic.js';
 
 	import {
@@ -274,6 +275,11 @@
 
 			submitJob() {
 				var params = this.setParams()
+				if (!params.subList || params.subList.length == 0) {
+					uni.hideLoading()
+					this.showErrorMessage("请扫描您需要提交的备货任务")
+					return
+				}
 				console.log("提交参数", JSON.stringify(params));
 
 				stockUpJobsubmit(params).then(res => {
@@ -298,38 +304,41 @@
 						item.Locations.forEach(fromLocation => {
 							fromLocation.Batchs.forEach(batch => {
 								let subItem = batch.detail;
-								subItem.recordList = [];
-								if (batch.Records.length > 0) {
-									batch.Records.forEach(r => {
-										let record = {};
-										record.handleQty = r.qty;
-										record.toContainerNumber = r
-											.ContainerNumber;
-										record.toInventoryStatus = r
-											.inventoryStatus;
-										record.toLocationCode = subItem
-											.toLocationCode;
-										record.supplierCode = r.supplierCode;
-
-										//使用在途库不改变管理模式
-										if (this.toLocationCode == null) {
-											record.toPackingNumber = r
-												.packingNumber;
-											record.toBatch = r.batch;
-										} else {
-											var info = getPackingNumberAndBatch(
-												this.managementList, r
-												.itemCode,
-												r.packingNumber, r
-												.batch);
-											record.toPackingNumber = info
-												.packingNumber;
-											record.toBatch = info.batch;
-										}
-										subItem.recordList.push(record);
-									})
-									subList.push(subItem);
+								if (subItem != undefined) {
+									subItem.recordList = [];
+									if (batch.Records.length > 0) {
+										batch.Records.forEach(r => {
+											let record = {};
+											record.handleQty = r.qty;
+											record.toContainerNumber = r
+												.ContainerNumber;
+											record.toInventoryStatus = r
+												.inventoryStatus;
+											record.toLocationCode = subItem
+												.toLocationCode;
+											record.supplierCode = r.supplierCode;
+									
+											//使用在途库不改变管理模式
+											if (this.toLocationCode == null) {
+												record.toPackingNumber = r
+													.packingNumber;
+												record.toBatch = r.batch;
+											} else {
+												var info = getPackingNumberAndBatch(
+													this.managementList, r
+													.itemCode,
+													r.packingNumber, r
+													.batch);
+												record.toPackingNumber = info
+													.packingNumber;
+												record.toBatch = info.batch;
+											}
+											subItem.recordList.push(record);
+										})
+										subList.push(deepCopyData(subItem));
+									}
 								}
+								
 							})
 						})
 					})