From e92ae6610410a25826093330bbf42296e746c51d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 10 一月 2025 23:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/router/viewGird.js | 5 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/MesOutboundOrderController.cs | 26 +++++
代码管理/WMS/WIDESEA_WMSClient/src/views/Login.vue | 6
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 14 +-
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService_Pick.cs | 10 +
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/872f6857-ecdf-4715-ac7a-765ab4769441.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs | 5 -
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs | 5 +
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue | 12 --
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/mesOutboundOrder.vue | 132 +++++++++----------------
/dev/null | 0
代码管理/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue | 13 ++
代码管理/WMS/WIDESEA_WMSClient/src/views/Index.vue | 5
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs | 2
代码管理/WMS/WIDESEA_WMSClient/public/webconfig.js | 3
代码管理/WMS/WIDESEA_WMSClient/src/api/http.js | 2
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue | 2
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/157ae1fd-6c00-4a8d-bfe7-e0b23990d57b.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs | 2
22 files changed, 127 insertions(+), 124 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/public/webconfig.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/public/webconfig.js"
index 0f9be86..9ca9383 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/public/webconfig.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/public/webconfig.js"
@@ -1,3 +1,4 @@
window.webConfig = {
- "webApiBaseUrl":"http://127.0.0.1:9293/" //"http://10.30.4.92:9283/"
+ "webApiBaseUrl": "http://127.0.0.1:9293/",
+ "webApiProduction":"http://10.30.4.92:9283/"
}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/api/http.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/api/http.js"
index fa439d0..70a500f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/api/http.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/api/http.js"
@@ -19,7 +19,7 @@
}
else if (process.env.NODE_ENV == 'production') {
- axios.defaults.baseURL = window.webConfig.webApiBaseUrl;
+ axios.defaults.baseURL = window.webConfig.webApiProduction;
}
if (!axios.defaults.baseURL.endsWith('/')) {
axios.defaults.baseURL+="/";
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue"
index b6bdde8..acfbc12 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue"
@@ -182,7 +182,18 @@
"鏌ヨ涓�"
)
.then((x) => {
- this.tableData = x;
+
+ var label=[
+ { label: '宸插垎閰�', value: 0 },
+ { label: '鍑哄簱涓�', value: 1 },
+ { label: '鍑哄簱瀹屾垚', value: 2 },
+ { label: '鎷ｉ�夊畬鎴�', value: 3 },
+ { label: '鎾ら攢', value: 99 }
+ ]
+ this.tableData=x.map((i) => ({
+ ...i,
+ status:label.find((j) => j.value === i.status).label
+ }))
});
},
},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/router/viewGird.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/router/viewGird.js"
index 9278d4c..ccb09c9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/router/viewGird.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/router/viewGird.js"
@@ -176,6 +176,11 @@
name: 'userInfo',
component: () => import('@/views/basic/userInfo.vue')
}
+ , {
+ path: '/mesOutboundOrder',
+ name: 'mesOutboundOrder',
+ component: () => import('@/views/outbound/mesOutboundOrder.vue')
+ }
]
export default viewgird
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Index.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Index.vue"
index d186352..db301d8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Index.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Index.vue"
@@ -598,13 +598,14 @@
let _userInfo = store.getters.getUserInfo();
if (_userInfo) {
- userName.value = _userInfo.userName;
+ console.log(_userInfo);
+ userName.value = _userInfo.trueNmae;
if (_userInfo.img) {
userImg.value = _config.base.getImgSrc(_userInfo.img, http.ipAddress);
}
}
- createSocket("ws://127.0.0.1:9295/" + _userInfo.userName);
+ createSocket("ws://127.0.0.1:9296/" + _userInfo.userName);
Object.assign(_config.$tabs, { open: open, close: close });
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Login.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Login.vue"
index d303005..81243fa 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Login.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Login.vue"
@@ -117,9 +117,9 @@
const loading = ref(false);
const codeImgSrc = ref("");
const userInfo = reactive({
- userName: "admin",
- password: "123456",
- verificationCode: "1234",
+ userName: "",
+ password: "",
+ verificationCode: "",
UUID: undefined,
});
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
index 343764a..b6a588f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
@@ -47,7 +47,7 @@
const searchFormOptions = ref([
[
{ title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
- { title: "宸烽亾缂栧彿", field: "roadwayNo" },
+ { title: "宸烽亾缂栧彿", field: "roadwayNo",type:"like" },
{ title: "璐т綅绫诲瀷", field: "locationType",type: "select",dataKey: "locationTypeEnum",data: [], },
{ title: "绂佺敤鐘舵��", field: "enableStatus" ,type: "select",dataKey: "enableStatusEnum",data: [],},
],
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/mesOutboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/mesOutboundOrder.vue"
index deec775..bf25d44 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/mesOutboundOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/mesOutboundOrder.vue"
@@ -27,73 +27,21 @@
sortName: "id",
});
const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
});
const editFormOptions = ref([
[
- {
- title: "璁惧缂栧彿",
- required: true,
- field: "deviceCode",
- type: "string",
- },
- {
- title: "璁惧鍚嶇О",
- required: true,
- field: "deviceName",
- type: "string",
- },
- {
- title: "璁惧绫诲瀷",
- required: true,
- field: "deviceType",
- type: "string",
- },
- {
- title: "璁惧鐘舵��",
- required: true,
- field: "deviceStatus",
- type: "string",
- },
- ],
- [
- { title: "璁惧IP", required: true, field: "deviceIp", type: "string" },
- {
- title: "璁惧绔彛",
- required: true,
- field: "devicePort",
- type: "string",
- },
- {
- title: "PLC绫诲瀷",
- required: true,
- field: "devicePlcType",
- type: "string",
- },
- {
- title: "澶囨敞",
- field: "deviceRemark",
- type: "string",
- },
],
]);
const searchFormFields = ref({
- deviceCode: "",
- deviceType: "",
- deviceStatus: "",
+ orderNo: "",
+ materialCode: "",
+ batchNo: "",
});
const searchFormOptions = ref([
[
- { title: "璁惧缂栧彿", field: "deviceCode" },
- { title: "璁惧绫诲瀷", field: "deviceType" },
- { title: "璁惧鐘舵��", field: "deviceStatus" },
+ { title: "鍗曟嵁缂栧彿", field: "orderNo", type:"like" },
+ { title: "鐗╂枡缂栧彿", field: "materialCode" ,type:"like"},
+ { title: "鎵规鍙�", field: "batchNo" ,type:"like"},
],
]);
const columns = ref([
@@ -107,23 +55,23 @@
align: "left",
},
{
- field: "orderId",
- title: "鍑哄簱鍗曚富閿�",
+ field: "warehouseId",
+ title: "鎵�灞炰粨搴�",
type: "string",
- width: 90,
+ width: 80,
align: "left",
- hidden: true,
+ bind: { key: "warehouses", data: [] },
},
{
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
+ field: "orderNo",
+ title: "鍗曟嵁缂栧彿",
type: "string",
width: 150,
align: "left",
},
{
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
+ field: "taskNo",
+ title: "浠诲姟鍗曞彿",
type: "string",
width: 150,
align: "left",
@@ -136,64 +84,80 @@
align: "left",
},
{
- field: "orderQuantity",
+ field: "OrderStatus",
title: "鍗曟嵁鏁伴噺",
type: "string",
width: 90,
align: "left",
+ bind: { key: "orderDetailStatusEnum", data: [] }
},
{
- field: "lockQuantity",
- title: "閿佸畾鏁伴噺",
- type: "int",
+ field: "createType",
+ title: "鍒涘缓鏂瑰紡",
+ type: "string",
width: 120,
align: "left",
+ bind: { key: "createType", data: [] },
},
{
- field: "overOutQuantity",
- title: "宸插嚭鏁伴噺",
+ field: "materialCode",
+ title: "鐗╂枡缂栧彿",
type: "string",
width: 200,
align: "left",
},
{
- field: "orderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
+ field: "materialName",
+ title: "鐗╂枡鍚嶇О",
type: "string",
width: 180,
align: "left",
},
{
- field: "creater",
- title: "鍒涘缓浜�",
+ field: "unit",
+ title: "鍗曚綅",
type: "string",
width: 90,
align: "left",
},
{
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
+ field: "orderQuantity",
+ title: "鍗曟嵁鏁伴噺",
type: "datetime",
width: 160,
align: "left",
},
{
- field: "modifier",
- title: "淇敼浜�",
+ field: "lockQuantity",
+ title: "閿佸畾鏁伴噺",
type: "string",
width: 100,
align: "left",
},
{
- field: "modifyDate",
- title: "淇敼鏃堕棿",
+ field: "overOutQuantity",
+ title: "宸插嚭鏁伴噺",
type: "datetime",
width: 160,
align: "left",
},
{
- field: "remark",
- title: "澶囨敞",
+ field: "line",
+ title: "绾夸綋",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "targetAddressCode",
+ title: "绾胯竟浠撳湴鍧�鐮�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "width",
+ title: "瑁佸垏瀹�",
type: "string",
width: 100,
align: "left",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
index 6029098..fc8b569 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
@@ -50,7 +50,7 @@
[
{ title: "鐗╂枡缂栧彿", field: "materielCode",type: "like"},
{ title: "鎵规鍙�", field: "batchNo",type: "like"},
- { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouse",data: [],},
+ { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],},
],
]);
const columns = ref([
@@ -73,14 +73,6 @@
align: "left",
},
{
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
field: "locationCode",
title: "璐т綅缂栧彿",
type: "string",
@@ -100,7 +92,7 @@
type: "string",
width: 80,
align: "left",
- bind: { key: "warehouse", data: [] },
+ bind: { key: "warehouses", data: [] },
},
{
field: "roadwayNo",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0b9c1ceb-8251-465b-9731-71c408afb4eb.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0b9c1ceb-8251-465b-9731-71c408afb4eb.vsidx"
deleted file mode 100644
index f94b9a1..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0b9c1ceb-8251-465b-9731-71c408afb4eb.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/157ae1fd-6c00-4a8d-bfe7-e0b23990d57b.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/157ae1fd-6c00-4a8d-bfe7-e0b23990d57b.vsidx"
new file mode 100644
index 0000000..363e52e
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/157ae1fd-6c00-4a8d-bfe7-e0b23990d57b.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/872f6857-ecdf-4715-ac7a-765ab4769441.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/872f6857-ecdf-4715-ac7a-765ab4769441.vsidx"
new file mode 100644
index 0000000..6e724b6
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/872f6857-ecdf-4715-ac7a-765ab4769441.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs"
index 479b9d3..93237cc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs"
@@ -41,11 +41,6 @@
public int Layer { get; set; }
/// <summary>
- /// 搴撳尯涓婚敭
- /// </summary>
- public int WarehouseId { get; set; }
-
- /// <summary>
/// 璐т綅娣卞害
/// </summary>
public int Depth { get; set; }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs"
index f34fe08..e065674 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs"
@@ -56,7 +56,7 @@
/// <param name="orderDetailId"></param>
/// <param name="outStockStatus"></param>
/// <returns></returns>
- List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum outStockStatus);
+ List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum? outStockStatus);
/// <summary>
///
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs"
index f81227e..abf8185 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs"
@@ -110,9 +110,9 @@
return outStockLockInfo;
}
- public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum outStockStatus)
+ public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum? outStockStatus)
{
- return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && x.Status == outStockStatus.ObjToInt());
+ return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && outStockStatus==null?true:x.Status == outStockStatus.ObjToInt());
}
public List<Dt_OutStockLockInfo> GetStockOutboundOrder(SaveModel saveModel)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService_Pick.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService_Pick.cs"
index 6254dbf..07384b3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService_Pick.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService_Pick.cs"
@@ -42,7 +42,6 @@
outStockLockInfos[i].Status = OutLockStockStatusEnum.鎷ｉ�夊畬鎴�.ObjToInt();
}
List<Dt_StockInfoDetail> beforeDetaile = stockInfo.Details.GroupBy(x => x.MaterielCode).Select(x => new Dt_StockInfoDetail { MaterielCode = x.Key, StockQuantity = x.Sum(v => v.StockQuantity) }).ToList();
-
List<Dt_StockInfoDetail> updateDetailList = new List<Dt_StockInfoDetail>();
List<Dt_StockInfoDetail> deleteDetailList = new List<Dt_StockInfoDetail>();
for (int i = 0; i < stockInfo.Details.Count; i++)
@@ -73,7 +72,14 @@
});
stockInfo.StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt();
//_stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(deleteDetailList, OperateTypeEnum.鑷姩瀹屾垚);
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ if (stockInfo.Details.Sum(x=>x.StockQuantity)== stockInfo.Details.Sum(x => x.OutboundQuantity))
+ {
+ _stockService.StockInfoService.Repository.DeleteData(stockInfo);
+ }
+ else
+ {
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ }
_stockService.StockInfoDetailService.Repository.UpdateData(updateDetailList);
_stockService.StockInfoDetailService.Repository.DeleteData(deleteDetailList);
BaseDal.UpdateData(outStockLockInfos);
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 205d199..7bfa3f1 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"
@@ -296,7 +296,7 @@
Deptno = outboundOrder.DepartmentCode,
Deptname = outboundOrder.DepartmentName,
Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Createuser = outboundOrder.Creater,
+ Createuser = outStockLockInfos.FirstOrDefault().Creater,
Issitem = new List<ERPIssueItemModel>() { issueItemModel },
};
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs"
index 15ebd4b..2055a6c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs"
@@ -88,7 +88,6 @@
Depth = a.Depth,
EnalbeStatus = a.EnableStatus,
Layer = a.Layer,
- WarehouseId = b.WarehouseId,
LocationName = a.LocationName,
LocationStatus = a.LocationStatus,
LocationType = a.LocationType,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
index d62b1ee..fe09cc4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
@@ -75,7 +75,7 @@
_cacheService.AddOrUpdate(user.UserId.ToString(), token);
- content = WebResponseContent.Instance.OK(data: new { token, userName = user.UserName, img = user.HeadImageUrl });
+ content = WebResponseContent.Instance.OK(data: new { token, userName = user.UserName, img = user.HeadImageUrl,trueNmae=user.UserTrueName });
}
else
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index d5f2ef3..36030d6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -215,16 +215,13 @@
Dt_InboundOrder? inboundOrder = _inboundRepository.InboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == stockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();
+ List<ERPInboundDetailModel> detailModels = new List<ERPInboundDetailModel>();
if (stockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt())
{
- //鎺ㄩ�佸叆搴撳畬鎴愮粰Erp
if (inboundOrder == null)
{
return WebResponseContent.Instance.Error($"瀵瑰簲鍏ュ簱鍗曚笉瀛樺湪");
}
-
- List<ERPInboundDetailModel> detailModels = new List<ERPInboundDetailModel>();
-
foreach (var item in stockInfo.Details)
{
Dt_InboundOrderDetail? inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.RowNo == item.InboundOrderRowNo);
@@ -261,10 +258,7 @@
{
inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
}
- if (!_inboundOrderService.FeedbackInboundOrder(stockInfo, inboundOrder, detailModels).Status)//todo 淇敼澶勭悊
- {
- return WebResponseContent.Instance.Error($"鍏ュ簱鍚屾Erp澶辫触");
- }
+
}
if ((stockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt() || stockInfo.StockStatus == StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt()) && warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
@@ -304,6 +298,10 @@
_inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
}
_unitOfWorkManage.CommitTran();
+ if (stockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt())
+ {
+ _inboundOrderService.FeedbackInboundOrder(stockInfo, inboundOrder, detailModels);
+ }
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/MesOutboundOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/MesOutboundOrderController.cs"
new file mode 100644
index 0000000..4ca90b1
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/MesOutboundOrderController.cs"
@@ -0,0 +1,26 @@
+锘縰sing Autofac.Core;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core;
+using WIDESEA_Core.BaseController;
+using WIDESEA_DTO.Inbound;
+using WIDESEA_DTO.Outbound;
+using WIDESEA_IOutboundService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMSServer.Controllers.Outbound
+{
+ /// <summary>
+ /// MES鍑哄簱鍗�
+ /// </summary>
+ [Route("api/mesOutboundOrder")]
+ [ApiController]
+ public class MesOutboundOrderController : ApiBaseController<IMesOutboundOrderService, Dt_MesOutboundOrder>
+ {
+ public MesOutboundOrderController(IMesOutboundOrderService service) : base(service)
+ {
+
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
index 77615e3..112ea5c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
@@ -39,5 +39,10 @@
{
return Service.MaterialPick(palletCode);
}
+ [HttpPost, HttpGet, Route("GetByOrderDetailId"), AllowAnonymous]
+ public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId)
+ {
+ return Service.GetByOrderDetailId(orderDetailId,null);
+ }
}
}
--
Gitblit v1.9.3