From a8c315dc781efcf605546c92468adc58020692c5 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 11 十一月 2025 11:40:04 +0800
Subject: [PATCH] 提交
---
项目代码/WIDESEA_WMSClient/src/views/outbound/outboundOrderDetail.vue | 7 +++++++
.gitignore | 3 +++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 1 +
项目代码/WIDESEA_WMSClient/src/api/http.js | 3 ++-
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 2 +-
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue | 6 ++++++
项目代码/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue | 21 +++++++++------------
项目代码/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 9 +++++++++
8 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0cbd7c3..5a51a85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -276,3 +276,6 @@
椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1091.29919/SemanticSymbols.db-wal
椤圭洰浠ｇ爜/WIDESEA_WMSClient/public/webconfig.js
椤圭洰浠ｇ爜/WIDESEA_WMSClient/public/webconfig.js
+椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs
+椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs
+椤圭洰浠ｇ爜/WIDESEA_WMSClient/src/api/http.js
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/api/http.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/api/http.js"
index 70a500f..4418d76 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/api/http.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/api/http.js"
@@ -1,4 +1,5 @@
-import axios from 'axios'
+
+ import axios from 'axios'
import store from '../store/index'
// import {getCurrentInstance} from 'vue'
import { useRouter, useRoute } from 'vue-router'
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
index decb2fd..53a6eba 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
@@ -154,6 +154,12 @@
width: 90,
},
{
+ prop: "supplyCode",
+ title: "渚涘簲鍟嗙紪鍙�",
+ type: "string",
+ width: 150,
+ },
+ {
prop: "orderQuantity",
title: "鍗曟嵁鏁伴噺",
type: "string",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
index 9fddac1..38f1779 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
@@ -24,17 +24,15 @@
PalletDialog
},
setup() {
- // 琛ㄦ牸鍩虹閰嶇疆锛氬榻愯皟鎷ㄥ崟瀹炰綋
const table = ref({
key: "id",
footer: "Foots",
cnName: "璋冩嫧鍗�",
name: "allocateOrder",
- url: "/allocateOrder/", // 鍚庣鎺ュ彛璺緞闇�涓庤皟鎷ㄥ崟鎺ュ彛鍖归厤
+ url: "/allocateOrder/",
sortName: "id",
});
- // 缂栬緫琛ㄥ崟瀛楁锛氬搴擠t_AllocateOrder鍙紪杈戝睘鎬�
const editFormFields = ref({
orderNo: "",
upperOrderNo: "",
@@ -48,7 +46,6 @@
remark: "",
});
- // 缂栬緫琛ㄥ崟閰嶇疆锛氭寜瀹炰綋瀛楁绫诲瀷璁剧疆缁勪欢
const editFormOptions = ref([
[
{
@@ -72,7 +69,7 @@
title: "璁㈠崟绫诲瀷",
field: "orderType",
type: "select",
- dataKey: "allocateOrderType", // 璋冩嫧鍗曚笓灞炴灇涓緆ey
+ dataKey: "allocateOrderType",
data: [],
required: true,
},
@@ -88,7 +85,7 @@
title: "鏉ユ簮浠撳簱",
field: "fromWarehouse",
type: "select",
- dataKey: "warehouses", // 浠撳簱鏋氫妇key锛堝鐢ㄦ垨鍗曠嫭閰嶇疆锛�
+ dataKey: "warehouses",
data: [],
required: true,
},
@@ -121,7 +118,7 @@
],
]);
- // 鎼滅储琛ㄥ崟瀛楁锛氬搴擠t_AllocateOrder鏌ヨ灞炴��
+
const searchFormFields = ref({
orderNo: "",
upperOrderNo: "",
@@ -137,7 +134,7 @@
createDate: "",
});
- // 鎼滅储琛ㄥ崟閰嶇疆锛氭寜鏌ヨ闇�姹傝缃瓧娈电被鍨�
+
const searchFormOptions = ref([
[
{ title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
@@ -179,7 +176,7 @@
],
]);
- // 涓昏〃鏍煎垪閰嶇疆锛氬畬鍏ㄥ榻怐t_AllocateOrder瀛楁
+
const columns = ref([
{
field: "id",
@@ -338,11 +335,11 @@
width: 150,
align: "left",
required: true,
- dataKey: "materielCodes", // 鐗╂枡缂栫爜鏋氫妇key
+ dataKey: "materielCodes",
data: [],
},
{
- field: "materielName", // 瀹炰綋涓棤璇ュ瓧娈碉紝闇�鍚庣鍏宠仈杩斿洖鎴栬皟鏁翠负bind鏄犲皠
+ field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
width: 100,
@@ -466,7 +463,7 @@
searchFormFields,
searchFormOptions,
columns,
- detail,
+ detail,
palletVisible,
currentPalletDocNo,
handleOpenPalletDialog,
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
index cbe4d0b..d32b939 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
@@ -293,6 +293,15 @@
required: true,
},
{
+ field: "supplyCode",
+ title: "渚涘簲鍟嗙紪鍙�",
+ type: "string",
+ width: 90,
+ align: "left",
+ edit: { type: "string" },
+ required: true,
+ },
+ {
field: "orderQuantity",
title: "鍗曟嵁鏁伴噺",
type: "string",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrderDetail.vue"
index e992c4c..158032a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrderDetail.vue"
@@ -136,6 +136,13 @@
align: "left",
},
{
+ field: "supplyCode",
+ title: "渚涘簲鍟嗙紪鍙�",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
field: "orderQuantity",
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 96bb475..04ad8a0 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"
@@ -598,5 +598,6 @@
return content.Error("SumQuantity 缁熻搴撳瓨鏁伴噺澶辫触锛岃鍗曞彿锛歿OrderNo}");
}
}
+
}
}
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_TaskInfoService/TaskService_Outbound.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_TaskInfoService/TaskService_Outbound.cs"
index f143f8c..85be5fd 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_TaskInfoService/TaskService_Outbound.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_TaskInfoService/TaskService_Outbound.cs"
@@ -34,7 +34,7 @@
Dt_StockInfo stockInfo ;
if (string.IsNullOrEmpty(palletCode))
{
- stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletType == PalletTypeEnum.Empty.ObjToInt()).First();
+ stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletType == PalletTypeEnum.Empty.ObjToInt() && !string.IsNullOrWhiteSpace(x.LocationCode)).First();
}
else
{
--
Gitblit v1.9.3