From 05decba90504212f52778db6129b09935f4fe6a2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 17 一月 2025 13:33:28 +0800
Subject: [PATCH] 修改PDA入WMS平库
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 5 +-
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs | 5 +-
代码管理/淮安PDA/pages/stash/boxing.vue | 52 ++++++++-----------------
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs | 6 +++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs | 6 +-
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs | 2
6 files changed, 33 insertions(+), 43 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs"
index 70b95c6..23a51f2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs"
@@ -21,7 +21,7 @@
WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, string serNum);
WebResponseContent InPinKu(string inboundOrderId,int warehouseId, List<string> serNums);
- WebResponseContent InPinKu(int warehouseId, List<string> serNums);
+ WebResponseContent WMSInPinKu(int warehouseId, List<string> serNums);
WebResponseContent MaterielGroup(string palletCode, int Initiallife, int warehouseId, List<string> serNums);
//WebResponseContent FeedbackInboundOrder(int id);
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 2f92c4b..05664a8 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"
@@ -429,7 +429,7 @@
/// <param name="warehouseId"></param>
/// <param name="serNums"></param>
/// <returns></returns>
- public WebResponseContent InPinKu(int warehouseId, List<string> serNums)
+ public WebResponseContent WMSInPinKu(int warehouseId, List<string> serNums)
{
WebResponseContent content = new WebResponseContent();
try
@@ -472,6 +472,7 @@
SerialNumber = model.SerialNumber,
StockQuantity = model.Quantity,
OutboundQuantity = 0,
+ OrderNo = "",
Unit = materielInfo.MaterielUnit,
Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(),
ProductionDate = model.ProductionDate,
@@ -846,7 +847,7 @@
List<ERPInboundDetailModel>? detailModels = new List<ERPInboundDetailModel>();
foreach (var stockInfo in stockInfos)
{
- foreach (var item in stockInfo.Details.GroupBy(x=>x.InboundOrderRowNo).Select(x=>x.Key))
+ foreach (var item in stockInfo.Details.GroupBy(x => x.InboundOrderRowNo).Select(x => x.Key))
{
//鍖哄垎涓嶅悓鎵规
Dt_StockInfoDetail? dt_StockInfoDetail = stockInfo.Details.Where(x => x.InboundOrderRowNo == item).FirstOrDefault();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
index 7c60c3d..ad6a375 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
@@ -146,7 +146,7 @@
Way = 1,
Details = recevieOrderDetails
};
-
+
//鏇存柊鏀惰揣鍗曚俊鎭�
receiveOrder.ReceiveOrderStatus = ReceiveOrderStatusEnum.Completed.ObjToInt();
receiveOrder.UploadStatus = WhetherEnum.True.ObjToInt();
@@ -235,7 +235,7 @@
SupplierId = receiveOrder.SuppliersId,
Details = new List<Dt_InboundOrderDetail>()
};
-
+ List<Dt_MaterielInfo> materielCodeInfos = _basicRepository.MaterielInfoRepository.QueryData(x => receiveOrder.Details.Select(x => x.MaterielCode).ToList().Contains(x.MaterielCode));
foreach (var item in receiveOrder.Details)
{
float quantity = item.ReceivedQuantity;
@@ -253,6 +253,7 @@
Dt_InboundOrderDetail detail = new Dt_InboundOrderDetail()
{
MaterielCode = item.MaterielCode,
+ MaterielName = materielCodeInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "",
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
OrderQuantity = quantity,
OverInQuantity = 0,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs"
index e6c6247..1238647 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs"
@@ -33,6 +33,12 @@
public string MaterielCode { get; set; }
/// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鍚嶇О")]
+ public string MaterielName { get; set; }
+
+ /// <summary>
/// 鎵规鍙�
/// </summary>
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵规鍙�")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
index aff5205..9d4b73f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
@@ -47,10 +47,10 @@
/// <param name="warehouseId"></param>
/// <param name="serNums"></param>
/// <returns></returns>
- [HttpPost, HttpGet, Route("InPinKu")]
- public WebResponseContent InPinKu(int warehouseId, [FromBody] List<string> serNums)
+ [HttpPost, HttpGet, Route("WMSInPinKu")]
+ public WebResponseContent WMSInPinKu(int warehouseId, [FromBody] List<string> serNums)
{
- return Service.InPinKu(warehouseId, serNums);
+ return Service.WMSInPinKu(warehouseId, serNums);
}
/// <summary>
/// 鍗曚釜鐗╂枡鐮佺粍鐩�
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 a6683ad..7dcd249 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"
@@ -64,8 +64,8 @@
placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @input="inputChangebarcode" />
</uni-forms-item>
<uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" :disabled="addressdisabled" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="addressFocus" />
+ <uni-easyinput type="text" v-model="address" :disabled="addressdisabled"
+ placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput' :focus="addressFocus" />
</uni-forms-item>
<uni-forms-item>
<button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱纭</button>
@@ -101,26 +101,6 @@
</view>
</view>
<view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
- <uni-list :border="true">
- <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="index">
- <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.materielCode}}</view>
- <!-- <view style="font-size: 18px;">鐗╂枡鍚嶇О锛歿{item.matName}}</view> -->
- <view style="font-size: 18px;">鏁伴噺锛歿{item.orderQuantity}}</view>
- <view style="font-size: 18px;">鍗曚綅锛歿{item.unit}}</view>
- <view style="font-size: 18px;">缁勭洏鏁伴噺锛歿{item.receiptQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 3" class="headerstyle">
<view class="itemstyle">
<uni-forms label-width="180">
<uni-forms-item label="鍐呯鏍囩:">
@@ -189,8 +169,8 @@
Testlabel: "",
Testplaceholder: "",
Testcheck: false,
- Summmary:0,
- stockInfoDetail:[],
+ Summmary: 0,
+ stockInfoDetail: [],
addressdisabled: false,
pksns: [],
pkmaterSn: "",
@@ -217,7 +197,7 @@
this.items.push("鍏ュ钩搴�");
this.items[1] = "鍏ョ珛搴�";
this.address = "8005";
- }else if (this.warehouseId == 3) { //杈呮枡浠撳簱鍖篒D
+ } else if (this.warehouseId == 3) { //杈呮枡浠撳簱鍖篒D
this.address = "1011";
this.addressdisabled = true;
}
@@ -238,8 +218,9 @@
})
return;
}
- this.$u.post('/api/InboundOrder/InPinKu?warehouseId=' + this.warehouseId, this
+ this.$u.post('/api/InboundOrder/WMSInPinKu?warehouseId=' + this.warehouseId, this
.pksns).then(res => {
+ debugger
if (res.status) {
this.$refs.uToast.show({
title: "鍏ュ簱鎴愬姛",
@@ -443,19 +424,20 @@
}
if (this.materSn != "") {
this.focus = false;
- if(this.materSn.split(',').length != 6){
+ if (this.materSn.split(',').length != 6) {
this.materSn = "";
return;
}
var matSn = this.materSn;
//setTimeout(() => {
- this.materSn = "";
+ this.materSn = "";
//}, 10);
this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
this.Testcheck = false;
if (res.status) {
this.sns.push(res.data.serialNumber);
- if (this.warehouseId == 6 || this.warehouseId == 2 || this.warehouseId == 3) {
+ if (this.warehouseId == 6 || this.warehouseId == 2 || this.warehouseId ==
+ 3) {
if (this.matInfos.length > 0) {
this.matInfos = [];
}
@@ -552,12 +534,12 @@
// this.stockInfo = [];
this.stockInfoDetail = [];
if (res.status) {
- // this.stockInfo = res.data,
- this.stockInfoDetail = res.data.details
- //鑾峰彇鎬绘暟閲�
- this.stockInfoDetail.forEach(item => {
- this.Summmary+= item.stockQuantity;
- });
+ // this.stockInfo = res.data,
+ this.stockInfoDetail = res.data.details
+ //鑾峰彇鎬绘暟閲�
+ this.stockInfoDetail.forEach(item => {
+ this.Summmary += item.stockQuantity;
+ });
} else {
this.$refs.uToast.show({
// title: "鏈壘鍒版墭鐩樹俊鎭�",
--
Gitblit v1.9.3