lilei 1 ano atrás
pai
commit
53844b874a

+ 1 - 1
config/api.js

@@ -120,7 +120,7 @@ export const receivingStockList = (params, config = {}) => http.post(`/receiving
 //  入库审核 列表  有分页
 export const receivingAuditList = (params, config = {}) => http.post(`/receiving/queryStockInAuditPage/${params.pageNo}/${params.pageSize}`, params, config)
 // 修改入库数量
-export const updateRealPutQty = (params, config = {}) => http.post(`/receivingDetail/updateRealPutQty`, params, config)
+export const updateRealPutQty = (params, config = {}) => http.post(`/receivingDetail/updatePdaRealPutQty`, params, config)
 // 采购入库详细列表
 export const receivingDetail = (params, config = {}) => http.post(`/receivingDetail/queryPage/${params.pageNo}/${params.pageSize}`, params, config)
 // 采购入库详情

+ 6 - 11
pages/purchasing/index.vue

@@ -34,8 +34,8 @@
 				<view>总款数:{{ item.totalPutCategory }}</view>
 				<view>发货数量: {{ item.totalPutQty }}</view>
 				<view>发货金额: {{ item.totalPutAmount?toThousands(item.totalPutAmount,2):'0.00' }}</view>
-				<view>入库数量: {{ item && (item.totalRealPutQty || item.totalRealPutQty==0) ? item.totalRealPutQty : '--' }}</view>
-				<view>入库金额: {{ item && (item.totalRealPutAmount || item.totalRealPutAmount==0) ? toThousands(item.totalRealPutAmount, 2) : '--' }}</view>
+				<view>入库数量: {{ item && (item.pdaTotalRealPutQty || item.pdaTotalRealPutQty==0) ? item.pdaTotalRealPutQty : '--' }}</view>
+				<view>入库金额: {{ item && (item.pdaTotalRealPutAmount || item.pdaTotalRealPutAmount==0) ? toThousands(item.pdaTotalRealPutAmount, 2) : '--' }}</view>
 			</view>
 		</view>
 		<view class="p-body">
@@ -62,7 +62,7 @@
 							<view>{{item.warehouseLocationEntity&&item.warehouseLocationEntity.name||defWarehouseName[1]}}</view>
 						</view>
 					</uni-td>
-					<uni-td width="40%" align="center"><text style="color: red;">{{item.realPutQty}}</text>/{{item.putQty}}</uni-td>
+					<uni-td width="40%" align="center"><text style="color: red;">{{item.pdaRealPutQty||0}}</text>/{{item.putQty}}</uni-td>
 				</uni-tr>
 			</uni-table>
 		</view>
@@ -181,7 +181,7 @@
 			},
 			okPop(){
 				if(this.curProduct.packQty){
-					this.changePutQty(this.curProduct,Number(this.curProduct.realPutQty) + Number(this.curProduct.packQty))
+					this.changePutQty(this.curProduct,Number(this.curProduct.pdaRealPutQty||0) + Number(this.curProduct.packQty))
 					this.closePop()
 				}else{
 					uni.$u.toast("请输入数量!")
@@ -231,7 +231,7 @@
 			changePutQty(record, realPutQty){
 			  if(realPutQty){
 				  this.loading = true
-				  updateRealPutQty({id:record.id,realPutQty:realPutQty}).then(res => {
+				  updateRealPutQty({id:record.id,pdaRealPutQty:realPutQty}).then(res => {
 					if(res.status == 200){
 					  uni.$u.toast(res.message)
 					  this.getDetail()
@@ -253,12 +253,7 @@
 				}
 				const row = this.getCurRow()
 				if(row){
-					if(row.warehouseLocationSn){
-						this.changePutQty(row,row.realPutQty + (flag?1:-1))
-					}else{
-						uni.$u.toast("此商品没有仓库仓位")
-						playAudio('warn')
-					}
+					this.changePutQty(row,(row.pdaRealPutQty||0) + (flag?1:-1))
 				}else{
 					uni.$u.toast("此商品不存在")
 					playAudio('error')

+ 1 - 1
pages/stock/index.vue

@@ -2,7 +2,7 @@
 	<view class="stock-wrap">
 		<!-- 库存查询 -->
 		<view class="stock-con" v-if="$hasPermissions('M_stockQuery_mobile')">
-			<u-form :model="form" ref="uForm" label-width="100">
+			<u-form :model="form" ref="uForm" label-width="80">
 				<u-form-item label="条形码"><u-input v-model.trim="form.productQrCode" placeholder="请扫描或输入条形码" input-align="left" /></u-form-item>
 				<u-form-item label="产品编码"><u-input v-model.trim="form.productCode" placeholder="请输入产品编码" input-align="left" /></u-form-item>
 				<u-form-item label="产品名称"><u-input v-model.trim="form.productName" placeholder="请输入产品名称" input-align="left" /></u-form-item>

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff