新入库选择页面

src/views/Home.vue

@@ -15,10 +15,10 @@
         <img :src="outPic" alt="">
         <span class="label blue">出库</span>
       </div>
-      <!-- <div class="item" @click="go(2)">
+      <div class="item" @click="go(2)">
         <img :src="stock" alt="">
         <span class="label other">调仓</span>
-      </div> -->
+      </div>
     </div>
   </div>
 </template>

src/views/my-modal.vue

@@ -356,6 +356,7 @@ export default {
 		modal(n) {
 			this.$emit('input', n)
 			if (n) {
+				this.params.pageIndex = 1
 				this.getSupplierQRCode()
 			} else {
 			}
@@ -409,6 +410,8 @@ export default {
 					this.addShow = true
 					break
 				case 'shipment':
+					
+					
 					GetSupplierQRCode({
 						pageIndex: 1,
 						pageSize: 200000,
@@ -416,14 +419,17 @@ export default {
 						purchaseBillNo: this.data.purchaseBillNo,
 					}).then((res) => {
 						if (res.code === 0) {
-							console.log(res.result.qrCodeItems)
+							let rfidListCopy = []
+							res.result.qrCodeItems.map(
+								(item) => {
+									if(item.rfidCode) rfidListCopy.push(item.rfidCode)
+							})
+							
 							PlcStorageIn({
 								storageDoor: sessionStorage.getItem('door'),
 								plcStationCode:
 									sessionStorage.getItem('plcCode'),
-								rfidList: res.result.qrCodeItems.map(
-									(item) => item.rfidCode
-								),
+								rfidList: rfidListCopy,
 								remark: '一键入库',
 							}).then((res) => {
 								if (res.code === 0) {

src/views/store-change.vue

@@ -242,12 +242,19 @@ export default {
 					this.socketInit()
 				}, 500);
       } else {
+        console.log({
+          fromPlcStationCode: sessionStorage.getItem('plcCode'),
+          toPlcStationCode: this.toPlcStationCode,
+          rfidList: this.scanData.rfidTagItems.map(item => item.rfidCode)
+        })
         if (!this.toPlcStationCode) {
           return this.$Message.error('请选择仓库')
         }
+        // rfidList: this.scanData.rfidTagItems.map(item => item.rfidCode)
         ExchangeStorage({
           fromPlcStationCode: sessionStorage.getItem('plcCode'),
           toPlcStationCode: this.toPlcStationCode,
+
           rfidList: this.scanData.rfidTagItems.map(item => item.rfidCode)
         }).then(res => {
           if (res.code === 0) {
@@ -348,8 +355,8 @@ export default {
     socketInit() {
 			const v = this
 			window.ws = new WebSocket(
-				'ws://120.79.80.64:8050/cloudApi/webStock/' + window.localStorage.getItem('token')
-				//'ws://192.168.1.97:8300/webStock/' + window.localStorage.getItem('token')
+				'ws://120.79.80.64:8050/cloudApi/webStock/' + window.localStorage.getItem('jobNo')
+				// 'ws://192.168.1.97:8300/webStock/' + window.localStorage.getItem('token')
 			)
 			//申请一个WebSocket对象，参数是服务端地址，同http协议使用http://开头一样，WebSocket协议的url使用ws://开头，另外安全的WebSocket协议使用wss://开头
 			window.ws.onopen = function () {
@@ -362,17 +369,18 @@ export default {
 				
 				var msg = JSON.parse(e.data)
 				if (msg.type == 1) {
-					msg.data.instructions = 2
+					msg.data.instructions = 'out' + sessionStorage.getItem('plcCode')
 					msg.data.businessType = 2
-					msg.data.stockHouseId = 'c185883dba22478cb593d33f6b66cc53',
+					// 仓库id： 一楼仓库'c185883dba22478cb593d33f6b66cc53' 四楼仓库'0b8f584250bb4b40b72d641ce4849d15'
+					msg.data.stockHouseId = sessionStorage.getItem('plcCode') == 2 ? '0b8f584250bb4b40b72d641ce4849d15' : 'c185883dba22478cb593d33f6b66cc53',
 					msg.data.type = 2
 					msg.type = 2
 					window.ws.send(JSON.stringify(msg))
 				}
 				if(msg.type == 3){
-					console.log(msg.data.rfidData)
 					v.getScanList(msg.data.rfidData)
 				}
+				
 			}
 			window.ws.onclose = function (e) {
 				//当客户端收到服务端发送的关闭连接请求时，触发onclose事件

src/views/store-out-list.vue

@@ -10,7 +10,7 @@
 
 <script>
 import MyNav from '@/components/my-nav'
-import MyModalMaterial from '@/components/my-modal-form/my-modal-material'
+import MyModalMaterial from '@/components/my-modal-form/my-modal-material-2'
 import { ApplyTakeAdd } from '@/api/integrated'
 
 export default {