Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

mycomponents/detail/comRequestDetailCard.vue

@@ -75,7 +75,6 @@
 		watch: {
 			dataContent(newVal) {
 				var test =this.dataContent
-				debugger
 				this.requestItem = newVal.subList[0];
 			},
 		},

pages/deliver/request/deliverRequestCreate.vue

@@ -171,7 +171,6 @@
 			setRequestParams() {
 				var subList = []
 				this.detailSource.subList.forEach(detail => {
-					debugger
 					detail.soNumber = detail.package.soNumber;
 					detail.soLine = detail.package.soLine;
 					detail.remark = ""

pages/inspect/job/inspectFullDetail.vue

@@ -330,12 +330,12 @@
 
 			commit() {
 				this.scanCount = getScanCount(this.subList);
-				if (this.scanCount == 0) {
-					this.showErrorMessage("扫描数为0,请先扫描")
-					return;
-				}
-				//如果是全检，必须全部扫描
-					if (this.scanCount == this.subList.length) {
+				// if (this.scanCount == 0) {
+				// 	this.showErrorMessage("扫描数为0,请先扫描")
+				// 	return;
+				// }
+				//如果是全检，必须全部扫描-------改为:任务中的是否允许部分提交：nxt 2023年12月13日
+				if (this.jobContent.allowPartialComplete == "TRUE") {
 					this.submitJob();
 				} else {
 					//不允许部分提交，提示

pages/issue/job/issueDetail.vue

@@ -140,7 +140,6 @@
 		methods: {
 			resizeCollapse() {
 				this.$nextTick(r => {
-					// debugger;
 					this.$refs.comIssueDetailCard.forEach(r => {
 						r.resizeCollapse();
 					})
@@ -291,6 +290,13 @@
 									batch.Records.forEach(r => {
 										let record = {};
 										record.handleQty = r.qty;
+										
+										record.fromPackingNumber = r
+											.packingNumber;
+										record.fromBatch = r.batch;
+										record.fromContainerNumber = r
+											.ContainerNumber;
+										
 										record.toContainerNumber = r
 											.ContainerNumber;
 										record.toInventoryStatus = r

pages/issue/request/issueRequest.vue

@@ -373,18 +373,10 @@
 		},
 		
 		requestConfirmsss(action, item) {
-			debugger;
 			uni.navigateTo({
 				url: './issueRequestDetail?type=add&item=' + item.id
 			});
 		}
-
-		// requestConfirm(action, item) {
-		// 	debugger;
-		// 	uni.navigateTo({
-		// 		url: './issueRequestDetail?type=add&item=' + item.id
-		// 	});
-		// }
 	}
 </script>
 

pages/repleinsh/coms/comScanReplishPack.vue

@@ -243,7 +243,8 @@
 							title: '加载中',
 							mask: true
 						})
-						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses, balanceRes => {
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+							balanceRes => {
 								if (balanceRes.success) {
 									if (balanceRes.data.list.length == 0) {
 										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
@@ -368,7 +369,8 @@
 					itemCode: label.itemCode,
 					packingNumber: label.packingNumber,
 					batch: label.batch,
-					qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
+					qty: Number(balance.qty),
+					// qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
 					uom: balance.uom,
 					inventoryStatus: balance.inventoryStatus,
 					balance: balance,

pages/repleinsh/job/repleinshDetail.vue

@@ -12,7 +12,8 @@
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="">
 				<view v-for="(toLocation, index) in detailSource">
-					<com-repleish-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
+					<com-repleish-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
+						@updateData='updateData'>
 					</com-repleish-detail-card>
 				</view>
 			</scroll-view>
@@ -259,6 +260,13 @@
 									batch.Records.forEach(r => {
 										let record = {};
 										record.handleQty = r.qty;
+
+										record.fromPackingNumber = r
+											.packingNumber;
+										record.fromBatch = r.batch;
+										record.fromContainerNumber = r
+											.ContainerNumber;
+
 										record.toContainerNumber = r
 											.ContainerNumber;
 										record.toInventoryStatus = r

static/config.json

@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.106:12080/admin-api",
+			"value": "http://192.168.0.230:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.178:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",