优化

api/pda/workOrder.js

@@ -164,6 +164,20 @@ export async function assetPage(params) {
 	return Promise.reject(data.message);
 }
 
+// 库存台账
+
+export async function realTimeInventory(params) {
+	const data = await get(
+		Vue.prototype.apiUrl + `/wms/outin/getRealTimeInventory`, params, true,
+	);
+	if (data.code == 0) {
+		return data.data;
+	}
+	return Promise.reject(data.message);
+}
+
+
+
 
 
 

pages/pda/feeding/components/palletBom.vue

@@ -12,7 +12,7 @@
 
 			<view class='content_table' v-for="(item,index) in palletList" :key='index'>
 				<view class="item">
-					<view class="lable rx-cc">舟皿code</view>
+					<view class="lable rx-cc">code</view>
 					<view class="content ">
 					 {{item.code}}
 					</view>
@@ -22,30 +22,30 @@
 
 
 				<view class="item">
-					<view class="lable rx-cc">舟皿名称</view>
+					<view class="lable rx-cc">名称</view>
 					<view class="content ">
 						 {{item.name}}
 					</view>
 				</view>
 
 				<view class="item">
-					<view class="lable rx-cc">舟皿型号</view>
+					<view class="lable rx-cc">型号</view>
 					<view class="content">
 						{{item.modelType}}
 					</view>
 				</view>
 				
 				<view class="item">
-					<view class="lable rx-cc">出库仓库</view>
+					<view class="lable rx-cc">仓库</view>
 					<view class="content">
-						{{item.pathName}}
+					{{item.pathName || item.positionVO && item.positionVO[0].pathName}}
 					</view>
 				</view>
 
 				<view class="item">
-					<view class="lable rx-cc">舟皿数量</view>
+					<view class="lable rx-cc">数量</view>
 					<view class="content content_num">
-						<input class="uni-input" v-model="item.feedQuantity" type='digit' ></input>
+						<input class="uni-input" v-model="item.feedQuantity || 1" type='digit' ></input>
 					</view>
 				</view>
 

pages/pda/feeding/components/revolvingDiskBom.vue

@@ -7,14 +7,16 @@
 		</view>
 
 
-		<view class="material ">
-
+		<view class="material rx-ss" v-for="(item,index) in revolvingDiskList" :key='index'>
+			<view class="left rx-ss" @click="getDelete(index)">
+				<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
+			</view>
 
-			<view class='content_table' v-for="(item,index) in palletList" :key='index'>
+			<view class='content_table'>
 				<view class="item">
-					<view class="lable rx-cc">周转盘code</view>
+					<view class="lable rx-cc">code</view>
 					<view class="content ">
-					 {{item.code}}
+						{{item.code}}
 					</view>
 				</view>
 
@@ -22,30 +24,31 @@
 
 
 				<view class="item">
-					<view class="lable rx-cc">周转盘名称</view>
+					<view class="lable rx-cc">名称</view>
 					<view class="content ">
-						 {{item.name}}
+						{{item.name}}
 					</view>
 				</view>
 
 				<view class="item">
-					<view class="lable rx-cc">周转盘型号</view>
+					<view class="lable rx-cc">型号</view>
 					<view class="content">
 						{{item.modelType}}
 					</view>
 				</view>
-				
+
 				<view class="item">
-					<view class="lable rx-cc">周转盘仓库</view>
+					<view class="lable rx-cc">仓库</view>
 					<view class="content">
-						{{item.pathName}}
+						{{item.pathName || item.positionVO && item.positionVO[0].pathName}}
 					</view>
 				</view>
 
 				<view class="item">
-					<view class="lable rx-cc">周转盘数量</view>
+					<view class="lable rx-cc">数量</view>
 					<view class="content content_num">
-						<input class="uni-input" v-model="item.feedQuantity" type='digit' ></input>
+						<!-- <input class="uni-input" v-model="item.feedQuantity" type='digit' ></input> -->
+						{{ item.feedQuantity || 1}}
 					</view>
 				</view>
 
@@ -53,15 +56,12 @@
 
 		</view>
 
-	
+
 
 	</view>
 </template>
 
 <script>
-
-
-
 	export default {
 		props: {
 			revolvingDiskList: {
@@ -72,21 +72,23 @@
 
 		data() {
 			return {
-	
+
 			}
 		},
-		
+
 		created() {
 
-	
+
 		},
-		
+
 		methods: {
-	
-			
-			
-			
-			
+			getDelete(idx) {
+				this.revolvingDiskList.splice(idx, 1)
+			},
+
+
+
+
 		},
 	}
 </script>
@@ -127,10 +129,13 @@
 	.material {
 		margin-top: 10rpx;
 
+		.left {
+			width: 40rpx;
+		}
 
 
 		.content_table {
-			width: 100%;
+			width: 680rpx;
 			border: 2rpx solid $border-color;
 
 			.item {

pages/pda/feeding/details.vue

@@ -36,6 +36,7 @@
 						
 						
 					<palletBom v-if='item.palletList.length != 0' :palletList='item.palletList'></palletBom>
+					
 					<revolvingDiskBom v-if="item.revolvingDiskList.length != 0" :revolvingDiskList="item.revolvingDiskList"></revolvingDiskBom>
 
 					<packingBom v-if='item.packingList.length != 0' :list='item.packingList'></packingBom>

pages/pda/feeding/single.js

@@ -101,6 +101,20 @@ export const tableHeader = selectEquiType => {
 				},
 
 			]
+			
+			
+			case 26:
+				return [
+			
+					{
+						label: '仓库',
+						prop: 'pathName'
+					},
+			
+				
+			
+				]
+			
 
 
 

pages/pda/feeding/single.vue

@@ -88,7 +88,7 @@
 
 				let _arr = (this.storageKey && uni.getStorageSync(this.storageKey)) || []
 				this.memoList = [..._arr[0].modelList, ..._arr[0].equipmentList, ..._arr[0].instanceList, ..._arr[0]
-					.aridRegionList, ..._arr[0].turnover
+					.aridRegionList, ..._arr[0].turnover, ..._arr[0].palletList, ..._arr[0].revolvingDiskList
 				]
 
 

pages/pda/jobBooking/components/palletBom.vue

@@ -9,29 +9,14 @@
 
 		<view class="material ">
 
-
 			<view class='content_table' v-for="(item,index) in palletList" :key='index'>
-				<view class="item" @click="handleType" v-if="!isDetails">
-					<view class="lable rx-cc">舟皿类型</view>
-					<view class="content content_num">
-						<input class="uni-input" v-model="item.categoryLevelName"></input>
-					</view>
-				</view>
-
-				<view class="item" @click="handleType" v-if="isDetails">
-					<view class="lable rx-cc">舟皿类型</view>
-					<view class="content ">
-						{{item.name}}
-					</view>
-				</view>
-
 
 
 				<view class="item">
 					<view class="lable rx-cc">舟皿名称</view>
 					<view class="content ">
 						<zxz-uni-data-select :localdata="boatList" v-model="item.categoryId" dataValue='id'
-							format='{name}-{code}' dataKey="code" filterable :clear='false' v-if="!isDetails"
+							format='{name}-{code}' dataKey="code" filterable :clear='false'
 							@change='inputChange'></zxz-uni-data-select>
 
 						<view v-if="isDetails">{{item.code }} </view>
@@ -48,27 +33,32 @@
 				<view class="item">
 					<view class="lable rx-cc">舟皿数量</view>
 					<view class="content content_num">
-						<input class="uni-input" v-model="item.quantity" type='digit' :disabled="isDetails"></input>
+						<input class="uni-input" v-model="item.quantity " type='digit' :disabled="isDetails"></input>
 					</view>
 				</view>
 
+
+				<view class="item" v-if="item.hideKc">
+					<view class="lable rx-cc">库存</view>
+					<view class="content content_num">
+						{{ packingCountBase }} {{item.unit}}
+					</view>
+				</view>
+
+
 			</view>
 
 		</view>
 
-		<ba-tree-picker ref="treePicker" key="verify" :multiple="false" @select-change="confirm" title="选择分类"
-			:localdata="classificationList" valueKey="id" textKey="name" childrenKey="children" />
+
 
 	</view>
 </template>
 
 <script>
-	import baTreePicker from '@/components/ba-tree-picker/ba-tree-picker.vue'
-	
-	
 	import {
-		treeByPid,
-		assetPage,
+
+		realTimeInventory,
 	} from '@/api/pda/workOrder.js'
 
 	export default {
@@ -87,44 +77,32 @@
 			return {
 				classificationList: [],
 				boatList: [],
+
+				packingCountBase: 0,
 			}
 		},
-		
+
 		created() {
-				this.getTreeList()
+			this.getInventoryList()
 		},
-		
+
 		methods: {
-			getTreeList() {
-				let params = {
-					ids: [8]
-				}
-				treeByPid(params).then(res => {
-					this.classificationList = res
-			
-				})
-			},
-			
-			
-			confirm(id, name, rootCategoryLevelId) {
-				this.$set(this.palletList[0], 'categoryLevelId', id[0])
-				this.$set(this.palletList[0], 'categoryLevelName', name)
-				this.$set(this.palletList[0], 'rootCategoryLevelId', rootCategoryLevelId)
-			
-			
-			
-			
+			getInventoryList() {
 				let param = {
-					categoryLevelId: id,
+					categoryLevelId: 8,
+					dimension: 1,
 					pageNum: 1,
 					size: -1,
 				}
-				assetPage(param).then(res => {
+				realTimeInventory(param).then(res => {
 					this.boatList = res.list
 				})
 			},
-			
-			
+
+
+
+
+
 			inputChange(e) {
 				this.$set(this.palletList[0], 'categoryId', e.id)
 				this.$set(this.palletList[0], 'code', e.code)
@@ -135,19 +113,28 @@
 				this.$set(this.palletList[0], 'modelType', e.modelType)
 				this.$set(this.palletList[0], 'quantity', e.quantity)
 				this.$set(this.palletList[0], 'unit', e.unit)
+
+
+				if (Object.prototype.hasOwnProperty.call(e, 'packingCountBase')) {
+					this.packingCountBase = e.packingCountBase
+					this.$set(this.palletList[0], 'hideKc', true)
+
+				}
+
+
+
+
+
 				this.$forceUpdate()
-			
-			
-			
-			},
-			
-			handleType() {
-				this.$refs.treePicker._show()
+
+
+
 			},
-			
-			
-			
-			
+
+
+
+
+
 		},
 	}
 </script>

pages/pda/jobBooking/index/index.vue

@@ -23,7 +23,9 @@
 					<jobBom v-if='isLoad' :item='objData' :notFormed='objData.notFormedList' @penalize='penalize'
 						@modeNum='modeNum'></jobBom>
 
-					<palletBom :palletList='objData.palletList'></palletBom>
+					<palletBom   v-if="objData.palletList.length != 0"  :palletList='objData.palletList'></palletBom>
+					
+					<revolvingDiskBom v-if="isLoad && objData.revolvingDiskList.length > 0" :revolvingDiskList="objData.revolvingDiskList" ></revolvingDiskBom>
 
 					<oneJobBom v-if='objData.instanceList &&  objData.instanceList.length != 0 && taskType != 4'
 						:item='objData' :list='objData.instanceList'>
@@ -44,9 +46,10 @@
 
 					<packingBom :taskId='taskId' :workOrderId='id' :objData='objData' ref="packRef"
 						v-if='taskType == 4 && clientEnvironmentId != 3  && objData'></packingBom>
-						
-						<packingTgBom  v-if='objData.instanceList &&  objData.instanceList.length != 0 && taskType == 4 && clientEnvironmentId == 3' 
-						:item='objData' :list='objData.instanceList'></packingTgBom>
+
+					<packingTgBom
+						v-if='objData.pickOutInList &&  objData.pickOutInList.length != 0 && taskType == 4 && clientEnvironmentId == 3'
+						:item='objData' :list='objData.pickOutInList'></packingTgBom>
 
 
 
@@ -129,6 +132,7 @@
 	import paramBom from '../../feeding/components/paramBom.vue'
 	import packingBom from '../components/packingBom.vue'
 	import packingTgBom from '../components/packingTgBom'
+	import revolvingDiskBom from '../../feeding/components/revolvingDiskBom.vue'
 	import SearchPopup from '../../components/searchPopup.vue'
 
 
@@ -147,6 +151,7 @@
 			paramBom,
 			packingBom,
 			packingTgBom,
+			revolvingDiskBom,
 			SearchPopup
 		},
 		data() {
@@ -360,7 +365,6 @@
 			getList() {
 				this.isLoad = false
 				getByIdReport(this.id, this.taskId).then(res => {
-					console.log('11', res)
 
 					this.objData = res
 					if (!this.objData.hasOwnProperty('turnover')) {
@@ -373,26 +377,51 @@
 					if (!this.objData.hasOwnProperty('instanceList')) {
 						this.objData['instanceList'] = []
 					}
+					
+					
+					if (!this.objData.hasOwnProperty('palletList')) {
+						this.objData['palletList'] = []
+					}
+					
+					
+					if (!this.objData.hasOwnProperty('revolvingDiskList')) {
+						this.objData['revolvingDiskList'] = []
+					}
+					
+					
 
 
 					// this.taskType = res.currentTaskDiagram.type
 
 
+					if (this.objData.palletList.length > 0) {
+						this.objData.palletList = this.objData.palletList.map(m => {
+							return {
+							 hideKc: true, // 不显示库存
+								quantity: m.feedQuantity,
+								...m
+							}
+						})
+					} else {
+						// this.objData.palletList = [{
+						// 	categoryLevelId: '',
+						// 	categoryLevelName: '',
+						// 	categoryId: '',
+						// 	rootCategoryLevelId: '',
+						// 	code: '',
+						// 	name: '',
+						// 	specification: '',
+						// 	brandNum: '',
+						// 	modelType: '',
+						// 	quantity: '',
+						// 	unit: '',
+						// }]
+
+					}
+
+
 
 
-					this.objData.palletList = [{
-						categoryLevelId: '',
-						categoryLevelName: '',
-						categoryId: '',
-						rootCategoryLevelId: '',
-						code: '',
-						name: '',
-						specification: '',
-						brandNum: '',
-						modelType: '',
-						quantity: '',
-						unit: ''
-					}]
 					this.objData.workReportInfo = {
 						formingNum: null,
 						formingWeight: null,

pages/pda/workOrder/search/index.vue

@@ -242,7 +242,7 @@
 				if (this.isType == 'feed') {
 					let _arr = (this.storageKey && uni.getStorageSync(this.storageKey)) || []
 					this.memoList = [..._arr[0].modelList, ..._arr[0].equipmentList, ..._arr[0].instanceList, ..._arr[0]
-						.aridRegionList, ..._arr[0].turnover
+						.aridRegionList, ..._arr[0].turnover, ..._arr[0].palletList, ..._arr[0].revolvingDiskList
 					]