From b4fccc0d704362a1747cc90d6e8c60414ad1a1f6 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 25 十一月 2025 05:33:39 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue | 6 +++---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 21 ++++++++++++++-------
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue | 6 ++++++
项目代码/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js | 5 ++---
项目代码/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue | 19 +++++++++++++------
5 files changed, 38 insertions(+), 19 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js"
index c6578d5..5cc22c5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js"
@@ -71,9 +71,8 @@
// 鍙戣捣鎾ら攢缁勭洏璇锋眰
try {
//console.log('鍙戣捣鎾ら攢缁勭洏璇锋眰锛屾墭鐩樺彿锛�', formData.palletCode.trim());
- const response = await http.post('/api/InboundOrder/CancelPalletGroup', {
- palletCode: formData.palletCode.trim()
- });
+ const response = await http.post('/api/InboundOrder/UndoPalletGroup?palletCode='+formData.palletCode.trim());
+
const { status, message, data } = response;
if (status) {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue"
index acfbc12..bbb9cdb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue"
@@ -111,6 +111,12 @@
width: 90,
},
{
+ prop: "currentBarcode",
+ title: "鏉＄爜",
+ type: "string",
+ width: 90,
+ },
+ {
prop: "batchNo",
title: "鎵规鍙�",
type: "string",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue"
index a22ee58..d66e4d4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue"
@@ -44,9 +44,9 @@
});
const searchFormOptions = ref([
[
- { title: "璐т綅鍙�", field: "locationCode" },
- { title: "鍗曟嵁缂栧彿", field: "orderNo" },
- { title: "浠诲姟鍙�", field: "taskNum" },
+ { title: "璐т綅鍙�", field: "locationCode" ,type:"like"},
+ { title: "鍗曟嵁缂栧彿", field: "orderNo",type:"like"},
+ { title: "浠诲姟鍙�", field: "taskNum" ,type:"like"},
],
[
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
index f7d65a4..7e8e7dd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
@@ -39,15 +39,15 @@
});
const searchFormOptions = ref([
[
- { title: "鎵樼洏鍙�", field: "palleCode" },
- { title: "鐗╂枡缂栧彿", field: "materielCode" },
- { title: "鍗曟嵁缂栧彿", field: "orderNo" },
+ { title: "鎵樼洏鍙�", field: "palleCode" ,type:"like"},
+ { title: "鐗╂枡缂栧彿", field: "materielCode",type:"like" },
+ { title: "鍗曟嵁缂栧彿", field: "orderNo" ,type:"like"},
{ title: "鍙樺姩绫诲瀷", field: "changeType" ,type: "selectList",dataKey: "stockChangeType",data: [],},
],
[
- { title: "鎵规鍙�", field: "batchNo" },
- { title: "浠诲姟鍙�", field: "taskNum" },
- { title: "搴忓垪鍙�", field: "serilNumber" },
+ { title: "鎵规鍙�", field: "batchNo" ,type:"like"},
+ { title: "浠诲姟鍙�", field: "taskNum" ,type:"like"},
+ { title: "搴忓垪鍙�", field: "serilNumber" ,type:"like"},
],
]);
const columns = ref([
@@ -90,6 +90,13 @@
align: "left",
},
{
+ field: "barcode",
+ title: "鏉＄爜",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
field: "batchNo",
title: "鎵规鍙�",
type: "string",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index a18a2fb..e117602 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -652,20 +652,26 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺彿{palletCode}瀵瑰簲鐨勫簱瀛樿褰�");
}
+
+ if(stock.Details == null || !stock.Details.Any())
+ {
+ _stockRepository.DeleteData(stock);
+ return WebResponseContent.Instance.OK();
+ }
// 鑾峰彇搴撳瓨璇︽儏鍏宠仈鐨勬墍鏈夊叆搴撳崟鍙�
var relatedOrderNos = stock.Details.Select(d => d.OrderNo).First();
// 鏌ヨ鎵�鏈夊叧鑱旂殑鍏ュ簱鍗曪紙鍚鎯咃級
var inboundOrders = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>()
- .Includes(x => x.Details)
- .Where(x => relatedOrderNos==x.InboundOrderNo)
+ .Includes(x => x.Details)
+ .Where(x => relatedOrderNos == x.InboundOrderNo)
.First();
var barcodes = stock.Details.Select(d => d.Barcode).ToList();
- // 鍖归厤搴撳瓨鏉＄爜瀵瑰簲鐨勫叆搴撳崟鏄庣粏
- var matchedInboundDetails = inboundOrders.Details
- ?.Where(d => barcodes.Contains(d.Barcode))
- .ToList();
+ // 鍖归厤搴撳瓨鏉＄爜瀵瑰簲鐨勫叆搴撳崟鏄庣粏
+ var matchedInboundDetails = inboundOrders.Details
+ ?.Where(d => barcodes.Contains(d.Barcode))
+ .ToList();
foreach (var detail in matchedInboundDetails)
{
detail.ReceiptQuantity = 0;
@@ -675,7 +681,8 @@
_stockDetailRepository.DeleteData(stock.Details);
_stockRepository.DeleteData(stock);
- return WebResponseContent.Instance.OK();
+
+ return WebResponseContent.Instance.OK("鎵樼洏鎾ら攢鎴愬姛");
}
}
}
--
Gitblit v1.9.3