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

api/request2.js

@@ -223,6 +223,21 @@ export function getContainerByNumber(number) {
 	});
 }
 
+
+/**
+ * 查询器具信息接口
+ * @param {*} number  器具代码
+ */
+export function getContainerDetailByNumber(number) {
+
+	return request({
+		url: baseApi + "/wms/container-main/getContainerByNumber?number=" + number,
+		method: "get",
+		data: {},
+	});
+}
+
+
 /**
  * 按器具查询库存明细
  * @param {*器具代码}  

mycomponents/balance/moveStatus.vue

@@ -4,7 +4,7 @@
 			•
 			{{statusDesc(fromInventoryStatus)}}
 		</view>
-		->
+		—>
 		<view :class="statusStyle(toInventoryStatus)">
 			•
 			{{statusDesc(toInventoryStatus)}}

pages/inventoryMove/coms/comMove.vue

@@ -24,7 +24,7 @@
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
 						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-							:locationTypeList="toLocationTypeArray"></requiredLocation>
+							:locationTypeList="toLocationTypeArray" :isShowEdit="toLocationCode==''"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -33,7 +33,8 @@
 			</view>
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'"></win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
+		</win-scan-pack-and-location>
 		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationTypeList="fromlocationTypeList"></win-scan-location>
 		<com-message ref="comMessage"></com-message>
@@ -100,16 +101,19 @@
 				type: Boolean,
 				default: false
 			},
-			
 			businessTypeCode: {
 				type: String,
 				default: "Move"
-			} //业务类型
+			}, //业务类型
+			toLocationCode: {
+				type: String,
+				default: ""
+			},
 		},
 		data() {
 			return {
 				fromLocationCode: "",
-				toLocationCode: "",
+				// toLocationCode: "",
 				toLocationInfo: {},
 				toLocationTypeArray: [],
 				toInventoryStatus: "",
@@ -305,7 +309,8 @@
 							inventoryMoveRecordSubmit(params).then(res => {
 								uni.hideLoading()
 								if (res.data) {
-										this.showCommitSuccessMessage("提交成功<br>生成"+this.title+"记录<br>" + res.data)
+									this.showCommitSuccessMessage("提交成功<br>生成" + this.title + "记录<br>" +
+										res.data)
 								} else {
 									this.showErrorMessage("提交失败[" + res.msg + "]")
 								}

pages/inventoryMove/coms/comMovebalance.vue

@@ -18,6 +18,9 @@
 					<moveStatus v-if="dataContent.inventoryStatus!=dataContent.toInventoryStatus"
 						:fromInventoryStatus="fromInventoryStatus" :toInventoryStatus="toInventoryStatus">
 					</moveStatus>
+					
+					<status :status='fromInventoryStatus'></status>
+					
 				</view>
 				<!-- <view class="" v-if="isDevlement()">
 					<view class="" style="font-size: 40rpx;">
@@ -44,6 +47,7 @@
 	import compareQty from '@/mycomponents/qty/compareQty.vue'
 	import moveStatus from '@/mycomponents/balance/moveStatus.vue'
 	import purchaseInfo from '@/mycomponents/purchase/purchaseInfo.vue'
+	import status from '@/mycomponents/status/status.vue'
 
 	export default {
 		components: {
@@ -54,7 +58,8 @@
 			recommendQty,
 			compareQty,
 			moveStatus,
-			purchaseInfo
+			purchaseInfo,
+			status
 		},
 
 		data() {

pages/inventoryMove/record/okToHoldRecord.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMove businessTypeCode='OkToHold' > </comMove>
+		<comMove businessTypeCode='OkToHold' toLocationCode="HOLD" > </comMove>
 	</view>
 </template>
 

static/menus/production_receipt.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg t="1703487001565" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="21325" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128">
+<path d="M664 240h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48zM664 384h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48zM504 528h-240a24 24 0 0 0 0 48h240a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="21326"></path>
+<path d="M800 128v392a24 24 0 0 1-48 0V128a16 16 0 0 0-16-16H192a16 16 0 0 0-16 16v704a16 16 0 0 0 16 16h328a24 24 0 0 1 0 48h-432a24 24 0 0 1 0-48h42.08A58.56 58.56 0 0 1 128 832V128a64 64 0 0 1 64-64h544a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="21327"></path><path d="M768 925.12a160 160 0 1 1 160-160 160 160 0 0 1-160 160m0 32a192 192 0 1 0-192-192 192 192 0 0 0 192 192z" fill="#3c9cff" p-id="21328"></path><path d="M864 736.8H672a16 16 0 0 0-11.2 4.64 16 16 0 0 0-3.36 5.12 16 16 0 0 0 0 12.32 16 16 0 0 0 3.36 5.12l57.44 57.44a16 16 0 0 0 22.56 0 16 16 0 0 0 0-22.72l-30.08-30.08H864a16 16 0 0 0 0-32z" fill="#3c9cff" p-id="21329"></path></svg>