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

mycomponents/scan/winScanItem.vue

@@ -46,6 +46,7 @@
 		data() {
 			return {
 				code: '',
+				result: {},
 				isShow: false,
 				expand: false,
 				scanList: [],
@@ -76,6 +77,7 @@
 				this.$refs.scan.clearScanValue();
 			},
 			getScanResult(result) {
+				this.result = result;
 				if (result.label.barType == "QRCode") {
 					this.code = result.label.itemCode;
 				} else if (result.label.barType == "BarCode") {
@@ -86,6 +88,7 @@
 			callBack() {
 				this.$refs.scan.clear();
 				this.$emit("getScanCode", this.code);
+				this.$emit("getScanResult", this.code, this.result);
 			},
 			change(e) {
 				this.isShow = e.show

pages/issue/coms/comIssueRequestPopup.vue

@@ -45,6 +45,13 @@
 									<uni-number-box :value="counQty" @change="change" style='margin-left: 10rpx;'
 										:focus="numberFocus" @blur='numberFocus = false'>
 									</uni-number-box>
+
+									<view class="std_pack">
+										<text>
+											/{{stdQty}}
+											<!-- {{Number(dataContent.stdPackQty)}}•{{getStdPackUnit(dataContent.uom)}} -->
+										</text>
+									</view>
 									<uom :uom="uom"></uom>
 								</view>
 							</view>
@@ -58,7 +65,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		<win-scan-item ref="scanPopup" title='物料代码' @getScanCode='getScanCode'>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getItemScanResult'>
 		</win-scan-item>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
@@ -115,70 +122,7 @@
 				show: false,
 				isModifiedPosition: true,
 				positionList: [],
-				list: [{
+				stdQty: 0, //标包
-						value: 1,
-						label: '车间1',
-						children: [{
-								value: 2,
-								label: '生产线1',
-								children: [{
-										value: 3,
-										label: '工位1'
-									},
-									{
-										value: 4,
-										label: '工位2'
-									}
-								]
-							},
-							{
-								value: 5,
-								label: '生产线2',
-								children: [{
-										value: 6,
-										label: '工位1'
-									},
-									{
-										value: 7,
-										label: '工位2'
-									}
-								]
-							}
-						]
-					},
-					{
-						value: 8,
-						label: '车间2',
-						children: [{
-								value: 9,
-								label: '生产线1',
-								children: [{
-										value: 10,
-										label: '工位1'
-									},
-									{
-										value: 10,
-										label: '工位2'
-									}
-								]
-							}, {
-								value: 9,
-								label: '生产线2',
-								children: [{
-										value: 10,
-										label: '工位1'
-									},
-									{
-										value: 10,
-										label: '工位2'
-									}
-								]
-							},
-
-
-						]
-					}
-				]
 			}
 		},
 		props: {
@@ -347,15 +291,15 @@
 				}
 			},
 
-			getScanCode(code) {
+			getItemScanResult(code, scanResult) {
 				if (code == "") {
 					this.showErrorMessage('物料号不能为空')
 					return;
 				}
 				this.itemCode = "";
 				this.checkItemCode(code)
-			},
+				this.stdQty = scanResult.package.stdPackQty;
-
+			}
 		}
 	}
 </script>

pages/issue/record/issueRecord.vue

@@ -10,8 +10,10 @@
 						<view class="uni-row uni-flex">
 							<!-- 	<com-issue-request-info :workShopCode="workShopCode" :dataContent="toLocation">
 							</com-issue-request-info> -->
-							<work-station :workshopCode="workShopCode" :productionLineCode="toLocation.productionLineCode"
+							<work-station :workshopCode="workShopCode"
-								:workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode"></work-station>
+								:productionLineCode="toLocation.productionLineCode"
+								:workStationCode="toLocation.workStationCode"
+								:rawLocationCode="toLocation.toLocationCode"></work-station>
 						</view>
 						<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
 							@updateData='updateData'>
@@ -101,8 +103,8 @@
 				fromInventoryStatuses: "",
 				toInventoryStatuses: "",
 				requestList: [],
-				dataContent:{},
+				dataContent: {},
-				managementList:[]
+				managementList: []
 			}
 		},
 		mounted() {
@@ -212,7 +214,7 @@
 			caclcQty() {
 				var totalQty = 0;
 				this.detailSource.subList.forEach(res => {
-					totalQty = calc.add(totalQty,res.qty); 
+					totalQty = calc.add(totalQty, res.qty);
 				})
 				this.detailSource.totalQty = totalQty;
 			},
@@ -244,10 +246,10 @@
 						let handleQty = 0;
 						if (batch != undefined) {
 							batch.Records.forEach(res => {
-								handleQty = calc.add(handleQty,res.qty); 
+								handleQty = calc.add(handleQty, res.qty);
 							})
 							batch.handleQty = handleQty;
-							itemHandleQty = calc.add(itemHandleQty,handleQty)
+							itemHandleQty = calc.add(itemHandleQty, handleQty)
 						}
 					})
 				}
@@ -283,9 +285,17 @@
 											.inventoryStatus;
 										record.toLocationCode = subItem
 											.toLocationCode;
-										record.fromLocationCode = fromLocation.fromLocationCode
+										record.fromLocationCode = fromLocation
+											.fromLocationCode
 										record.supplierCode = r.supplierCode;
 										
+										let single_price = r.singlePrice == null ?
+											0 : r.singlePrice;
+
+										record.singlePrice = single_price;
+										record.amount = single_price * r.qty;
+
+
 										//使用在途库不改变管理模式
 										var info = getPackingNumberAndBatch(
 											this.managementList, r
@@ -360,11 +370,11 @@
 
 				})
 			},
-			clearData(){
+			clearData() {
-				this.detailSource =[];
+				this.detailSource = [];
-				this.requestList=[];
+				this.requestList = [];
-				this.dataContent ={}
+				this.dataContent = {}
-				this.managementList=[]
+				this.managementList = []
 			},
 
 			showMessage(message) {

static/config.json

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