From 41184c11005e8613b8a721fe06ea1c35f9651d3e Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 1 Dec 2023 10:07:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/basic.js                           |   1 -
 common/style/new_style.css                |  28 +++-
 common/style/pdabasic.css                 |   1 +
 mycomponents/balance/handleBalance.vue    |  17 +-
 mycomponents/balance/recommendBalance.vue |  14 +-
 mycomponents/item/itemQty.vue             |   2 +-
 mycomponents/qty/balanceQtyEdit.vue       |   5 +-
 pages/issue/coms/comIssueDetailCard.vue   |  41 +++--
 pages/issue/coms/comScanIssuePack.vue     |   6 +-
 pages/issue/job/issueDetail.vue           | 191 ++++++++++++++++++----
 pages/issue/js/issue.js                   |  15 +-
 static/config.json                        |   2 +-
 12 files changed, 233 insertions(+), 90 deletions(-)

diff --git a/common/basic.js b/common/basic.js
index fc1e7a5e..2d38eede 100644
--- a/common/basic.js
+++ b/common/basic.js
@@ -656,7 +656,6 @@ export function getPackingNumberAndBatch(managementList, itemCode, packingNumber
 		itemInfo.batch = batch
 	}
 	return itemInfo;
-
 }
 
 // //提示是否消息
diff --git a/common/style/new_style.css b/common/style/new_style.css
index ab98196a..8c45d000 100644
--- a/common/style/new_style.css
+++ b/common/style/new_style.css
@@ -233,13 +233,13 @@ uni-page-head .uni-page-head__title {
 }
 
 .cell_box .cell_info view {
-	font-size: 0.825rem;
+	font-size: 0.9375rem;
 	margin-bottom: 10rpx;
 	color: #7B8195;
 }
 
 .cell_box .cell_info .text_black {
-	font-size: .875rem;
+	font-size: 0.875rem;
 	color: #101010;
 }
 
@@ -305,7 +305,7 @@ uni-page-head .uni-page-head__title {
 }
 
 .cen_card .cell_box .cell_info .text_lightblue {
-	font-size: 0.725rem;
+	font-size: 0.925rem;
 }
 
 .bot_card {
@@ -2034,13 +2034,13 @@ button::after {
 .card_itemName {
 	color: #909399;
 	font-size: 30rpx;
- 	padding: 5rpx 20rpx;
+	padding: 5rpx 20rpx;
 }
 
 .card_ProdLine {
 	color: #909399;
 	font-size: 30rpx;
- 	padding: 5rpx 30rpx;
+	padding: 5rpx 30rpx;
 }
 
 
@@ -2120,11 +2120,11 @@ button::after {
 	background: linear-gradient(to right, #7ED7BD, #DCEFEE);
 }
 
-.card_view
-{
+.card_view {
 	font-size: 32rpx;
 	padding: 5rpx;
 }
+
 /* 
 .pack_view {
 	font-size: 32rpx;
@@ -2421,6 +2421,12 @@ button[disabled] {
 	align-items: center;
 }
 
+.space_between {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+}
+
 .text_recommend {
 	color: #0A84FF;
 	font-size: 38rpx;
@@ -2635,6 +2641,7 @@ button[disabled] {
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
+
 /**
  * 申请状态 审批中
  */
@@ -2645,6 +2652,7 @@ button[disabled] {
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
+
 /**
  * 申请状态 审批通过
  */
@@ -2655,6 +2663,7 @@ button[disabled] {
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
+
 /**
  * 申请状态 审批驳回
  */
@@ -2665,6 +2674,7 @@ button[disabled] {
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
+
 /**
  * 申请状态 处理中
  */
@@ -2675,6 +2685,7 @@ button[disabled] {
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
+
 /**
  * 申请状态 部分完成
  */
@@ -2685,6 +2696,7 @@ button[disabled] {
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
+
 /**
  * 申请状态 已完成
  */
@@ -2695,6 +2707,7 @@ button[disabled] {
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
+
 /**
  * 申请状态 中止
  */
@@ -2705,6 +2718,7 @@ button[disabled] {
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
+
 /**
  * 申请状态 已关闭
  */
diff --git a/common/style/pdabasic.css b/common/style/pdabasic.css
index f1083f3f..8fc37203 100644
--- a/common/style/pdabasic.css
+++ b/common/style/pdabasic.css
@@ -720,6 +720,7 @@ page {
 .page-main {
 	flex: 1;
 	position: relative;
+	background: #fff;
 }
 
 .page-main-scroll {
diff --git a/mycomponents/balance/handleBalance.vue b/mycomponents/balance/handleBalance.vue
index 73c4e49b..a35de49c 100644
--- a/mycomponents/balance/handleBalance.vue
+++ b/mycomponents/balance/handleBalance.vue
@@ -1,17 +1,12 @@
 <template>
 	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
-		<view class="uni-flex uni-row space-between uni-inline-item">
-			<view class="uni-flex uni-row  uni-inline-item">
-				<view style=" width: 20px;display: flex;justify-content: center;align-items: center;color: #0CC2B6;">
-					实际
-				</view>
-				<view>
-					<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
-					<batch v-if="isShowBatch" :batch="detail.batch"></batch>
-					<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
-				</view>
+		<view class="space_between">
+			<view >
+				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
+				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
+				<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
 			</view>
-			<view>
+			<view >
 				<recommend-qty v-if="detail.record==null || detail.record==undefined" :dataContent="detail"
 					:isShowStdPack="false"></recommend-qty>
 
diff --git a/mycomponents/balance/recommendBalance.vue b/mycomponents/balance/recommendBalance.vue
index 443293b6..38e24604 100644
--- a/mycomponents/balance/recommendBalance.vue
+++ b/mycomponents/balance/recommendBalance.vue
@@ -1,17 +1,17 @@
 <template>
 	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
-		<view class="uni-flex uni-row space-between ">
-			<view class="uni-flex uni-row  ">
-				<view class="center" style=" width: 20px;color: #32C1E8;">
+		<view class="uni-flex uni-row space-between center ">
+			<view class="uni-flex uni-row center ">
+				<view style=" width: 20px;color: #32C1E8;">
 					推荐
 				</view>
-				<view class="center">
-					<!-- <pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack> -->
+				<view >
+					<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
 					<batch v-if="isShowBatch" :batch="detail.batch"></batch>
-					<!-- <location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location> -->
+					<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
 				</view>
 			</view>
-			<view>
+			<view >
 				<recommend-qty v-if="detail.Records==null || detail.Records.length==0" :dataContent="detail"
 					:isShowStdPack="false" :isShowStatus="false"></recommend-qty>
 				<compare-qty v-else :dataContent="detail" :recommendQty="Number( detail.qty)"
diff --git a/mycomponents/item/itemQty.vue b/mycomponents/item/itemQty.vue
index 363d16cb..b1b5f10f 100644
--- a/mycomponents/item/itemQty.vue
+++ b/mycomponents/item/itemQty.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="uni-flex uni-row space-between uni-inline-item" style="background-color:#fff;">
+	<view class="uni-flex uni-row space-between center" style="background-color:#fff;">
 		<view>
 			<item :dataContent="dataContent"></item>
 		</view>
diff --git a/mycomponents/qty/balanceQtyEdit.vue b/mycomponents/qty/balanceQtyEdit.vue
index 8768c247..ea290cbd 100644
--- a/mycomponents/qty/balanceQtyEdit.vue
+++ b/mycomponents/qty/balanceQtyEdit.vue
@@ -122,17 +122,14 @@
 		},
 		methods: {
 			openEditPopup(item, handleQty) {
+				debugger;
 				this.dataContent = item
 				this.inventoryStatus = this.dataContent.inventoryStatus
 				this.toInventoryStatus = this.dataContent.toInventoryStatus
 				this.allQty = Number(handleQty)
-				console.log("数量",this.allQty)
 				setTimeout(res=>{
 					this.$refs.popup.open('bottom')
 				},500)
-					
-				
-				
 			},
 			closeEditPopup() {
 				this.$refs.popup.close()
diff --git a/pages/issue/coms/comIssueDetailCard.vue b/pages/issue/coms/comIssueDetailCard.vue
index d25a2be6..afd9726b 100644
--- a/pages/issue/coms/comIssueDetailCard.vue
+++ b/pages/issue/coms/comIssueDetailCard.vue
@@ -9,10 +9,6 @@
 					<template v-slot:title>
 						<!-- 物品 -->
 						<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
-
-						<view class="card_ProdLine">
-							{{item.productionLineCode}} | {{item.workStationCode}}
-						</view>
 					</template>
 					<u-line />
 					<view v-for="(loacation,index) in item.Locations">
@@ -23,22 +19,25 @@
 								</location>
 							</view>
 							<view v-for="(batch,index) in loacation.Batchs">
-								<view>
-									<recommend-balance style='margin-left: 20px;' :detail="batch" 
-										:isShowLocation="false" :isShowPack="false">
-									</recommend-balance>
-								</view>
-
-								<view v-if='batch.Records!=null || batch.Records!=undefined '
-									v-for="(record,index) in batch.Records">
-									<uni-swipe-action ref="swipeAction">
-										<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
-											:right-options="scanOptions">
-											<handle-balance style='margin-left: 40px;' :detail="record" 
-												:isShowLocation="false" :isShowBatch="batch.packingNumber!=null">
-											</handle-balance>
-										</uni-swipe-action-item>
-									</uni-swipe-action>
+								<recommend-balance style='margin-left: 20px;' :detail="batch"
+									:isShowLocation="false" :isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
+								</recommend-balance>
+								<view class="uni-flex uni-row" v-if='batch.Records.length>0'>
+									<view class="center " style=" width: 20px; color: #0CC2B6; margin-left: 40px;">
+										实际
+									</view>
+									<view class="uni-flex uni-column" style="width: 100%;">
+										<view v-for="(record,index) in batch.Records">
+											<uni-swipe-action ref="swipeAction">
+												<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
+													:right-options="scanOptions">
+													<handle-balance :detail="record" :isShowLocation="false"
+														:isShowBatch="batch.packingNumber!=null">
+													</handle-balance>
+												</uni-swipe-action-item>
+											</uni-swipe-action>
+										</view>
+									</view>
 								</view>
 							</view>
 						</view>
@@ -49,7 +48,6 @@
 	</view>
 	<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
 	<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
-
 	<comMessage ref="message"></comMessage>
 </template>
 
@@ -139,6 +137,7 @@
 				let that = this;
 				that.editItem = item;
 				that.batchItem = batch;
+				item.balance.balanceQty=item.balance.qty;
 				that.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
 			},
 
diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue
index 4e7ebf06..0c673d75 100644
--- a/pages/issue/coms/comScanIssuePack.vue
+++ b/pages/issue/coms/comScanIssuePack.vue
@@ -276,7 +276,6 @@
 
 							let record = batch.Records.find(r => r.packingNumber == packingCode);
 							if (record == undefined) {
-
 								//如果有推荐箱码
 								if (batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
@@ -359,7 +358,8 @@
 					uom: balance.uom,
 					inventoryStatus: balance.inventoryStatus,
 					balance: balance,
-					toLocationCode: this.toLocationCode
+					toLocationCode: this.toLocationCode,
+					supplierCode:label.supplierCode
 				}
 				return record;
 			},
@@ -408,6 +408,8 @@
 			},
 			edit(item) {
 				this.editItem = item;
+				// item.balance.balanceQty = item.balance.qty;
+				item.balance.balanceQty=item.balance.qty;
 				this.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
 			},
 
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index 9c108f25..0486cfa6 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -1,13 +1,33 @@
 <template>
-	<!-- <page-meta root-font-size="18px"></page-meta> -->
 	<view class="page-wraper">
 		<view class="page-main">
-			<view class="" style="padding: 15rpx;font-size: 35rpx; ">
+			<!-- 	<view class="" style="padding: 15rpx;font-size: 35rpx; ">
 				车间代码 : {{jobContent.workShopCode}}
-			</view>
-			<u-line />
+			</view> -->
+
 			<scroll-view scroll-y="true" class="">
 				<view v-for="(toLocation, index) in detailSource">
+					<view class="cen_card" style="padding: 20rpx;">
+						<view class="cell_box uni-flex uni-row">
+							<view class="cell_info">
+								<view class="text_lightblue">车间</view>
+								<view>{{jobContent.workShopCode}}</view>
+							</view>
+							<view class="cell_info">
+								<view class="text_lightblue">生产线</view>
+								<view>{{toLocation.productionLineCode}}</view>
+							</view>
+							<view class="cell_info">
+								<view class="text_lightblue">工位</view>
+								<view>{{ toLocation.workStationCode }}</view>
+							</view>
+							<view class="cell_info">
+								<view class="text_lightblue">原材料库</view>
+								<view>{{ toLocation.toLocationCode}}</view>
+							</view>
+						</view>
+						<u-line />
+					</view>
 					<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
 					</com-issue-detail-card>
 				</view>
@@ -41,13 +61,20 @@
 		updateTitle,
 		getRemoveOption,
 		getISODateTime,
-		getDirectoryItemArray
+		getCurrDateTime,
+		getDirectoryItemArray,
+		getPackingNumberAndBatch,
 	} from '@/common/basic.js';
 
 	import {
 		getDataSource
 	} from '@/pages/issue/js/issue.js';
 
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+
 	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
@@ -146,9 +173,6 @@
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.detailSource, that.subList)
-							// that.fromLocationCode = that.subList[0].fromLocationCode
-							// that.toLocationCode = that.subList[0].toLocationCode
-							// that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
 							that.resizeCollapse();
 							uni.hideLoading();
 						} else {
@@ -182,28 +206,134 @@
 				// 			return res;
 				// 		}
 				// 	});
-				
-				
-				
 
-				this.dataContent.itemCodeList.forEach(res => {
-					if (res.handleQty > res.recommendQty) {
-						this.$refs.modal.showConfirmMessageModal('实际数量大于需求数量,是否提交?', confirm => {
-							if (confirm) {
-								//提交
-								uni.showToast({
-									title: "提交"
-								})
-							}
+				uni.showLoading({
+					title: '提交中...',
+					mask: true
+				})
+
+				this.submitJob();
+
+
+				// this.dataContent.itemCodeList.forEach(res => {
+				// 	if (res.handleQty > res.recommendQty) {
+				// 		this.$refs.modal.showConfirmMessageModal('实际数量大于需求数量,是否提交?', confirm => {
+				// 			if (confirm) {
+				// 				//提交
+				// 				uni.showToast({
+				// 					title: "提交"
+				// 				})
+				// 			}
+				// 		})
+				// 	} else {
+				// 		uni.showToast({
+				// 			title: "扫描的数量" + res.handleQty + "]小于推荐数量[" + res.recommendQty + "]"
+				// 		})
+				// 	}
+				// })
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//目前任务只到一个库位
+				var itemCodes = []
+				let locationCode = this.detailSource[0].toLocationCode
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				//使用在途库，不查询管理模式
+				if (this.jobContent.useOnTheWayLocation == 'TRUE') {
+					this.submit();
+				} else {
+					//获取管理模式，封装参数
+					getManagementPrecisions(itemCodes, locationCode, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							this.submit();
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+					});
+				}
+			},
+
+			setParams() {
+				var subList = []
+				var createTime = getCurrDateTime();
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						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.jobContent.useOnTheWayLocation ==
+											'TRUE') {
+											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);
+								}
+							})
 						})
+					})
+				})
+
+				this.jobContent.subList = subList
+				this.jobContent.createTime = createTime;
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			submit() {
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+
+				issueJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成发货记录" + res.data)
 					} else {
-						uni.showToast({
-							title: "扫描的数量" + res.handleQty + "]小于推荐数量[" + res.recommendQty + "]"
-						})
+						this.showErrorMessage("提交失败" + res.msg)
 					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
 				})
 			},
 
+
 			cancel() {
 				let that = this;
 				this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的零件和目标库位信息?', res => {
@@ -241,15 +371,16 @@
 				if (item != undefined) {
 					item.Locations.forEach(l => {
 						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
-								.packingNumber == '') && b.batch ==
+								.packingNumber == null || b.packingNumber == '') && b.batch ==
 							record.batch);
-
 						let handleQty = 0;
-						batch.Records.forEach(res => {
-							handleQty += Number(res.qty)
-						})
-						batch.handleQty = handleQty;
-						itemHandleQty += handleQty;
+						if (batch != undefined) {
+							batch.Records.forEach(res => {
+								handleQty += Number(res.qty)
+							})
+							batch.handleQty = handleQty;
+							itemHandleQty += handleQty;
+						}
 					})
 				}
 				// item.handleQty=itemHandleQty;
diff --git a/pages/issue/js/issue.js b/pages/issue/js/issue.js
index 2473229b..dc78933c 100644
--- a/pages/issue/js/issue.js
+++ b/pages/issue/js/issue.js
@@ -3,10 +3,11 @@ export function getDataSource(list, subList) {
 		let detail = subList[i];
 		var location = list.find(r =>
 			r.toLocationCode == detail.toLocationCode)
-
 		if (location == undefined) {
 			location = {
 				toLocationCode: detail.toLocationCode,
+				productionLineCode: detail.productionLineCode,
+				workStationCode: detail.workStationCode,
 				Items: []
 			}
 			list.push(location);
@@ -32,12 +33,15 @@ export function createDetailInfo(location, detail) {
 			item.Locations.push(location);
 		} else {
 			//在库位下查找批次
-			let batch = location.Batchs.find(r => r.batch == detail.Bacth);
+			debugger;
+			let batch = location.Batchs.find(r => r.batch == detail.batch);
 			if (batch == undefined) {
 				let batch = createBatchInfo(detail);
 				location.Batchs.push(batch);
 			} else {
-				batch.Recommends.push(detail);
+				if (detail.packingNumber != "" && detail.packingNumber != null) {
+					batch.Recommends.push(detail);
+				}
 			}
 		}
 	}
@@ -76,17 +80,18 @@ export function createLocationInfo(detail) {
 
 export function createBatchInfo(detail) {
 	let batch = {
+		detail: detail,
 		batch: detail.batch,
 		packingNumber: detail.packingNumber,
 		qty: detail.qty,
 		uom: detail.uom,
 		handleQty: 0,
 		Recommends: [],
-		Records: []
+		Records: [],
 	}
 
 	//推荐到了箱码和批次
-	if (detail.packingNumber != '' && detail.packingNumber != null) {
+	if (detail.packingNumber != "" && detail.packingNumber != null) {
 		batch.Recommends.push(detail);
 	}
 	return batch;
diff --git a/static/config.json b/static/config.json
index d6de88d6..0e975816 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 		
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.230:12080/admin-api",
+			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"dev2":"http://192.168.0.157:12080/admin-api",
 			"dev":"http://dev.ccwin-in.com:25100/api/admin-api",
 			"local":"http://localhost:12080",