From e7037a128a61a6f8d3095960ead68a65dd6d69f2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 13 一月 2025 19:40:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs | 2
代码管理/淮安PDA/pages/stash/receiveorderoutbound.vue | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 9 +++
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 15 +++++
代码管理/淮安PDA/pages/stash/boxing.vue | 57 +++++++++++++++++++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 4 +
代码管理/淮安PDA/pages/stash/pickingMat.vue | 58 +++++++++++++++++++
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue | 18 ++---
代码管理/淮安PDA/pages/stash/QueryData.vue | 6 ++
9 files changed, 156 insertions(+), 15 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue"
index 6750ee2..467ec49 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue"
@@ -236,7 +236,7 @@
align: "left",
},
{
- field: "orderId",
+ field: "receiveOrderId",
title: "鏀惰揣鍗曚富閿�",
type: "string",
width: 90,
@@ -244,8 +244,8 @@
hidden: true,
},
{
- field: "rowNo",
- title: "琛屽彿",
+ field: "purchaseOrderDetailRowNo",
+ title: "閲囪喘鍗曟槑缁嗚鍙�",
type: "string",
width: 60,
align: "left",
@@ -256,7 +256,6 @@
type: "select",
width: 160,
align: "left",
- edit: { type: "" },
required: true,
},
{
@@ -265,7 +264,6 @@
type: "select",
width: 150,
align: "left",
- edit: { type: "" },
required: true,
},
{
@@ -274,7 +272,6 @@
type: "string",
width: 150,
align: "left",
- edit: { type: "" },
},
{
field: "lotNo",
@@ -282,16 +279,14 @@
type: "decimal",
width: 90,
align: "left",
- edit: { type: "" },
required: true,
},
{
- field: "receivedQty",
+ field: "receivedQuantity",
title: "鏀惰揣鏁伴噺",
type: "decimal",
width: 90,
align: "left",
- edit: { type: "number" },
required: true,
},
{
@@ -300,6 +295,7 @@
type: "int",
width: 90,
align: "left",
+ bind: { key: "yesno", data: [] },
},
{
field: "priceInTax",
@@ -316,8 +312,8 @@
align: "left",
},
{
- field: "currCode",
- title: "甯佸埆缂栫爜",
+ field: "unit",
+ title: "鍗曚綅",
type: "string",
width: 90,
align: "left",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
index 78b009c..0fe8eda 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
@@ -177,6 +177,21 @@
bind: { key: "createType", data: [] },
},
{
+ field: "departmentCode",
+ title: "淇敼鏃堕棿",
+ type: "string",
+ width: 120,
+ align: "left",
+ hidden:true
+ },
+ {
+ field: "departmentName",
+ title: "閮ㄩ棬鍚嶇О",
+ type: "string",
+ width: 160,
+ align: "left",
+ },
+ {
field: "creater",
title: "鍒涘缓浜�",
type: "string",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index b4686f5..56030ff 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -870,6 +870,15 @@
return PalletTypeEnum.LargestPallet.ObjToInt();
}
}
+ else if (warehouse.WarehouseCode == WarehouseEnum.HA153.ObjToString())
+ {
+ Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 1));
+ if (palletTypeInfo == null)
+ {
+ throw new Exception($"鎵樼洏鍙烽敊璇�");
+ }
+ return palletTypeInfo.PalletType;
+ }
else if (warehouse.WarehouseCode == WarehouseEnum.HA152.ObjToString())
{
Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs"
index 86a971f..5d8b6f2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs"
@@ -89,7 +89,7 @@
{
return WebResponseContent.Instance.Error($"璇ラ噰璐崟鏀惰揣宸插畬鎴�");
}
- Dt_PurchaseOrderDetail? purchaseOrderDetail = purchaseOrder.Details.FirstOrDefault(x => x.MaterielCode == model.MaterielCode && (x.PurchaseDetailStatus == PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt() || x.PurchaseDetailStatus == PurchaseOrderDetailStatusEnum.Receiving.ObjToInt()));
+ Dt_PurchaseOrderDetail? purchaseOrderDetail = purchaseOrder.Details.Where(x => x.MaterielCode == model.MaterielCode && (x.PurchaseDetailStatus == PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt() || x.PurchaseDetailStatus == PurchaseOrderDetailStatusEnum.Receiving.ObjToInt())).FirstOrDefault();
if (purchaseOrderDetail == null)
{
return WebResponseContent.Instance.Error($"璇ラ噰璐崟鏄庣粏鏀惰揣宸插畬鎴�");
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
index 8b7588d..9eff098 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
@@ -312,7 +312,9 @@
WarehouseId = warehouse.WarehouseId,
DepartmentCode = model.DepartmentCode,
DepartmentName = model.DepartmentName,
- Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
+ Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail },
+ Remark= model.Node
+
};
Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/QueryData.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/QueryData.vue"
index a98aac8..6f6f477 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/QueryData.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/QueryData.vue"
@@ -13,6 +13,7 @@
<view class="uni-list-box">
<view class="uni-content">
<view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{stockInfoBarcode}}</view>
+ <view class="uni-title-sub uni-ellipsis-2">鎬绘暟閲忥細{{Summmary}}</view>
</view>
</view>
</template>
@@ -45,6 +46,7 @@
// stockInfo: [],
stockInfoDetail: [],
barcode: '',
+ Summmary: 0,
barcodefocus: false,
warehouseId: 0,
stockInfoBarcode: '',
@@ -71,6 +73,10 @@
this.stockInfoBarcode = res.data.palletCode,
// this.stockInfo = res.data,
this.stockInfoDetail = res.data.details
+ //鑾峰彇鎬绘暟閲�
+ this.stockInfoDetail.forEach(item => {
+ this.Summmary+= item.stockQuantity;
+ });
} else {
this.$refs.uToast.show({
// title: "鏈壘鍒版墭鐩樹俊鎭�",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue"
index cc69b87..ad6852b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue"
@@ -72,6 +72,33 @@
</uni-forms-item>
</uni-forms>
</view>
+ <view>
+ <uni-list>
+ <uni-list-item direction="column" v-if="inboundBarcode">
+ <template v-slot:body>
+ <view class="uni-list-box">
+ <view class="uni-content">
+ <view class="uni-title-sub uni-ellipsis-2">缁勭洏鎬绘暟閲忥細{{Summmary}}</view>
+ </view>
+ </view>
+ </template>
+ </uni-list-item>
+ <uni-list-item direction="column" v-for="(item,index) in stockInfoDetail" :key="index">
+ <template v-slot:body>
+ <view class="uni-list-box">
+ <view class="uni-content">
+ <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栧彿锛歿{item.materielCode}}</view>
+ <view class="uni-note">鐗╂枡鍚嶇О锛歿{item.materielName}}</view>
+ <view class="uni-note">鐗╂枡鎵规锛歿{item.batchNo}}</view>
+ <view class="uni-note">缁勭洏鏁伴噺锛歿{item.stockQuantity}}</view>
+ <view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.productionDate}}</view>
+ <view class="uni-note">鏈� 鏁� 鏈燂細{{item.effectiveDate}}</view>
+ </view>
+ </view>
+ </template>
+ </uni-list-item>
+ </uni-list>
+ </view>
</view>
<view v-if="current === 2" class="headerstyle">
<view class="itemstyle">
@@ -181,6 +208,8 @@
Testlabel: "",
Testplaceholder: "",
Testcheck: false,
+ Summmary:0,
+ stockInfoDetail:[]
}
},
onShow() {},
@@ -450,6 +479,34 @@
this.addressFocus = true;
}
})
+ this.$nextTick(function(x) {
+ if (this.inboundBarcode != '') {
+ var postData = {
+ MainData: {
+ "barcode": this.inboundBarcode,
+ "warehouseId": this.warehouseId,
+ }
+ };
+ this.$u.post('/api/StockInfo/StockQueryData', postData).then(res => {
+ // this.stockInfo = [];
+ this.stockInfoDetail = [];
+ if (res.status) {
+ // this.stockInfo = res.data,
+ this.stockInfoDetail = res.data.details
+ //鑾峰彇鎬绘暟閲�
+ this.stockInfoDetail.forEach(item => {
+ this.Summmary+= item.stockQuantity;
+ });
+ } else {
+ this.$refs.uToast.show({
+ // title: "鏈壘鍒版墭鐩樹俊鎭�",
+ title: res.message,
+ type: "error"
+ })
+ }
+ })
+ }
+ })
},
deleteList(res) {
this.matInfos.splice(res, 1);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/pickingMat.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/pickingMat.vue"
index 6b4767c..9d8df60 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/pickingMat.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/pickingMat.vue"
@@ -69,6 +69,34 @@
</uni-forms-item>
</uni-forms>
</view>
+ <view>
+ <uni-list>
+ <uni-list-item direction="column" v-if="inboundBarcode">
+ <template v-slot:body>
+ <view class="uni-list-box">
+ <view class="uni-content">
+ <view class="uni-title-sub uni-ellipsis-2">鎬绘暟閲忥細{{Summmary}}</view>
+ </view>
+ </view>
+ </template>
+ </uni-list-item>
+ <uni-list-item direction="column" v-for="(item,index) in stockInfoDetail" :key="index">
+ <template v-slot:body>
+ <view class="uni-list-box">
+ <view class="uni-content">
+ <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栧彿锛歿{item.materielCode}}</view>
+ <view class="uni-note">鐗╂枡鍚嶇О锛歿{item.materielName}}</view>
+ <view class="uni-note">鐗╂枡鎵规锛歿{item.batchNo}}</view>
+ <view class="uni-note">搴撳瓨鏁伴噺锛歿{item.stockQuantity}}</view>
+ <view class="uni-note">鍑哄簱鏁伴噺锛歿{item.outboundQuantity}}</view>
+ <view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.productionDate}}</view>
+ <view class="uni-note">鏈� 鏁� 鏈燂細{{item.effectiveDate}}</view>
+ </view>
+ </view>
+ </template>
+ </uni-list-item>
+ </uni-list>
+ </view>
</view>
</view>
<u-toast ref="uToast" />
@@ -106,6 +134,8 @@
inboundBarcode: "",
address: "",
warehouseId: 0,
+ Summmary: 0,
+ stockInfoDetail: []
}
},
onLoad(res) {
@@ -176,6 +206,34 @@
this.addressFocus = true;
}
})
+ this.$nextTick(function(x) {
+ if (this.inboundBarcode != '') {
+ var postData = {
+ MainData: {
+ "barcode": this.inboundBarcode,
+ "warehouseId": this.warehouseId,
+ }
+ };
+ this.$u.post('/api/StockInfo/StockQueryData', postData).then(res => {
+ // this.stockInfo = [];
+ this.stockInfoDetail = [];
+ if (res.status) {
+ // this.stockInfo = res.data,
+ this.stockInfoDetail = res.data.details
+ //鑾峰彇鎬绘暟閲�
+ this.stockInfoDetail.forEach(item => {
+ this.Summmary+= item.stockQuantity;
+ });
+ } else {
+ this.$refs.uToast.show({
+ // title: "鏈壘鍒版墭鐩樹俊鎭�",
+ title: res.message,
+ type: "error"
+ })
+ }
+ })
+ }
+ })
},
picking() {
if (this.barcode == "") {
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
index ada9295..aac059b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
@@ -50,7 +50,6 @@
<uni-list :border="true">
<uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="item.dtlId">
<template v-slot:body>
- <view class="uni-list-box">
<view class="uni-content">
<view style="font-size: 18px;">鏀惰揣鍗曞彿锛歿{orderNo}}</view>
<view style="font-size: 18px;">閲囪喘鍗曞彿锛歿{item.purchaseOrderNo}}</view>
@@ -59,7 +58,6 @@
<view style="font-size: 18px;">鏀惰揣鏁伴噺锛歿{item.receivedQuantity}}</view>
<view style="font-size: 18px;">鏄惁璐ㄦ锛歿{item.ifInspection==1?"鏄�":"鍚�"}}</view>
</view>
- </view>
</template>
</uni-list-item>
</uni-list>
--
Gitblit v1.9.3