From 635a49022f9f2dc3047456a63cd5f380c6724f87 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期五, 27 三月 2026 11:21:16 +0800
Subject: [PATCH] 新增MES领料计划单页面，修复出库详情单据类型的显示
---
项目代码/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json | 2
项目代码/WMS/WMSClient/src/views/Home.vue | 4
项目代码/WMS/WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue | 2
项目代码/WMS/WMSClient/src/router/viewGird.js | 4
项目代码/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs | 26 ++++
项目代码/WMS/WMSClient/src/views/outbound/outMESOrder.vue | 302 ++++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 336 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js"
index 5ba5355..5f1898d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js"
@@ -275,6 +275,10 @@
path: '/returnBSTOrderDetail',
name: 'returnBSTOrderDetail',
component: () => import('@/views/inbound/returnBSTOrderDetail.vue')
+ },{
+ path: '/outMESOrder',
+ name: 'outMESOrder',
+ component: () => import('@/views/outbound/outMESOrder.vue')
}
]
export default viewgird
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/Home.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/Home.vue"
index dc15e1f..a863757 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/Home.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/Home.vue"
@@ -698,8 +698,8 @@
.location-view {
flex: 1;
- width: 360%;
- max-width: 360%;
+ width: 470%;
+ max-width: 470%;
overflow: auto;
padding: 20px;
background-color: #f5f7fa;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue"
index 915a940..10344e9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue"
@@ -21,7 +21,7 @@
const table = ref({
key: "id",
footer: "Foots",
- cnName: "鍏ュ簱鍗�",
+ cnName: "鍏ュ簱鍗曟槑缁�",
name: "inboundOrder",
url: "/InboundOrder/",
sortName: "id",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outMESOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outMESOrder.vue"
index e69de29..cb82fa6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outMESOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outMESOrder.vue"
@@ -0,0 +1,302 @@
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/inbound/mesProInOrderInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "MES棰嗘枡璁″垝鍗�",
+ name: "outMESOrder",
+ url: "/OutMESOrder/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+ warehouseId:"",
+ productOrderNo:"",
+ mESProOrderType:"",
+ mESProOrderStatus:"",
+ materialCode:"",
+ materialLot:"",
+ proPackCode:"",
+ createDate:"",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [], },
+ { title: "鍑哄簱鏉ユ簮鏄庣粏ID", field: "outDetailId", type: "like" },
+ { title: "鐢熶骇璁㈠崟缂栫爜", field: "productOrderNo", type: "like" },
+ { title: "WMS鍗曟嵁缂栧彿", field: "outMESOrderNo", type: "like" },
+ ],
+ [
+ { title: "娲惧崟宸ュ崟缂栫爜", field: "sendOrderNo", type: "like" },
+ { title: "鐗╂枡缂栫爜", field: "materialCode", type: "like" },
+ { title: "鍔犲伐涓績鍖哄煙", field: "makeArea", type: "like" },
+ { title: "鍔犲伐涓績缂栧彿锛堟満鍙帮級", field: "makeCode", type: "select", dataKey: "makeCodeEnum", data: [] }
+ ],
+ [
+ { title: "鐢熶骇璁㈠崟鐘舵��", field: "outMESOrderStatus", type: "select", dataKey: "outboundStatusEnum", data: [] },
+ { title: "璁″垝棰嗘枡鏃堕棿", field: "planPickTime", type: "date" },
+ { title: "缁撴潫鏃堕棿", field: "endTime", type: "date" },
+ ]
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind: { key: "warehouses", data: [] }
+ },
+ {
+ field: "outDetailId",
+ title: "鍑哄簱鏉ユ簮鏄庣粏ID",
+ type: "int",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "outMESOrderNo",
+ title: "WMS鍗曟嵁缂栧彿",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "productOrderNo",
+ title: "鐢熶骇璁㈠崟缂栧彿锛堜笂娓革級",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "sendOrderNo",
+ title: "娲惧崟宸ュ崟缂栫爜",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialCode",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialLot",
+ title: "鐗╂枡鎵规",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "gradeCode",
+ title: "鐗╂枡绛夌骇",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "reqQuantity",
+ title: "鐗╂枡闇�姹傛暟閲�",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "makeArea",
+ title: "鍔犲伐涓績鍖哄煙",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "makeCode",
+ title: "鍔犲伐涓績缂栧彿锛堟満鍙帮級",
+ type: "string",
+ width: 200,
+ align: "left",
+ bind: { key: "", data: [
+ {key: "11",value: "涓�鍙峰嵃鍒锋満锛堟剰楂樺彂锛�" },
+ {key: "12",value: "浜屽彿鍗板埛鏈猴紙鍗庨槼涓棿锛�" },
+ {key: "13",value: "涓夊彿鍗板埛鏈猴紙鍗庨槼鍖楄竟锛�" },
+ {key: "31",value: "涓�鍙风粐甯冩満" },
+ {key: "33",value: "浜屽彿缁囧竷鏈�" },
+ {key: "22",value: "涓�鍙蜂腑閫熷垎鍒囨満" },
+ {key: "21",value: "浜屽彿楂橀�熷垎鍒囨満" },
+ {key: "25",value: "涓�鍙峰啿鍒囨満" },
+ {key: "26",value: "浜屽彿鍐插垏鏈�" },
+ {key: "27",value: "涓夊彿鍐插垏鏈�" },
+ {key: "26",value: "涓�鍙锋竻搴熺爜鍨涙ā鍒囨満" },
+ {key: "27",value: "浜屽彿娓呭簾鐮佸灈妯″垏鏈�" },
+ {key: "41",value: "涓�鍙风焊寮犲弻闈㈡穻鑶滄満" },
+ {key: "42",value: "涓�鍙锋棤绾哄竷鍙岄潰娣嬭啘鏈�" },
+ {key: "64",value: "涓�鍙风焊琚嬪洓鏉満" },
+ {key: "65",value: "浜屽彿绾歌鍥涙澂鏈�" },
+ {key: "66",value: "涓夊彿鎵佺怀鍐呮姌鍙屾澂鏈�" },
+ {key: "67",value: "浜斿彿绾歌鍙屾澂鏈�" },
+ {key: "68",value: "鍏彿绾歌鍙屾澂鏈�" },
+ {key: "69",value: "涓冨彿绾歌鍙屾澂鏈�" },
+ {key: "6A",value: "鍏彿绾歌鍙屾澂鏈�" },
+ {key: "6B",value: "涔濆彿绾歌鍗曟澂鏈�" },
+ {key: "6C",value: "鍗佸彿绾歌鍗曟澂鏈�" },
+ {key: "6D",value: "鍗佷竴鍙风焊琚嬪崟鏉満" },
+ {key: "51",value: "涓�鍙锋棤绾哄竷鍒惰鏈�" },
+ {key: "52",value: "浜屽彿鏃犵汉甯冨埗琚嬫満" },
+ {key: "53",value: "涓夊彿鏃犵汉甯冨埗琚嬫満" },
+ {key: "54",value: "浜斿彿鏃犵汉甯冨埗琚嬫満" },
+ {key: "55",value: "鍏彿鏃犵汉甯冨埗琚嬫満" },
+ {key: "56",value: "涓冨彿鏃犵汉甯冨埗琚嬫満" },
+ {key: "57",value: "鍏彿鏃犵汉甯冨埗琚嬫満" },
+ {key: "58",value: "涔濆彿鏃犵汉甯冨埗琚嬫満" },
+ {key: "59",value: "鍗佸彿鏃犵汉甯冨埗琚嬫満" },
+ {key: "5A",value: "鍗佷竴鍙锋棤绾哄竷鍒惰鏈�" },
+ {key: "81",value: "涓�鍙风珛寮忕焊鏉満" },
+ {key: "82",value: "浜屽彿绔嬪紡绾告澂鏈�" },
+ {key: "83",value: "涓夊彿绔嬪紡绾告澂鏈�" },
+ {key: "84",value: "浜斿彿绔嬪紡绾告澂鏈�" },
+ {key: "85",value: "鍏彿绔嬪紡绾告澂鏈�" },
+ {key: "86",value: "涓冨彿绔嬪紡绾告澂鏈�" },
+ {key: "87",value: "鍏彿绔嬪紡绾告澂鏈�" },
+ {key: "88",value: "涔濆彿绔嬪紡绾告澂鏈�" },
+ {key: "89",value: "鍗佸彿绔嬪紡绾告澂鏈�" },
+ {key: "8A",value: "鍗佷竴鍙风珛寮忕焊鏉満" },
+ {key: "8B",value: "鍗佷簩鍙风珛寮忕焊鏉満" },
+ {key: "8C",value: "涓�鍙峰崸寮忕焊鏉満" },
+ {key: "8D",value: "涓�鍙峰濂楃焊鏉満" },
+ {key: "8E",value: "浜屽彿澶栧绾告澂鏈�" },
+ {key: "8F",value: "涓夊彿澶栧绾告澂鏈�" },
+ {key: "8G",value: "浜斿彿澶栧绾告澂鏈�" },
+ {key: "8H",value: "浜屽彿鍗у紡绾告澂鏈�" },
+ {key: "8I",value: "涓夊彿鍗у紡绾告澂鏈�" },
+ {key: "8J",value: "鍏彿澶栧绾告澂鏈�" },
+ {key: "8K",value: "涓冨彿澶栧绾告澂鏈�" },
+ {key: "8L",value: "鍏彿澶栧绾告澂鏈�" },
+ {key: "8M",value: "涔濆彿澶栧绾告澂鏈�" },
+ {key: "8N",value: "浜斿彿鍗у紡绾告澂鏈�" },
+ {key: "8O",value: "鍏彿鍗у紡绾告澂鏈�" },
+ {key: "8P",value: "涓冨彿鍗у紡绾告澂鏈�" },
+ {key: "8Q",value: "鍗佷笁鍙风珛寮忕焊鏉満" },
+ {key: "8R",value: "鍗佷簲鍙风珛寮忕焊鏉満" },
+ {key: "8S",value: "鍗佸叚鍙风珛寮忕焊鏉満" },
+ {key: "8T",value: "鍗佷竷鍙风珛寮忕焊鏉満" },
+ {key: "8U",value: "鍗佸叓鍙风珛寮忕焊鏉満" },
+ ] },
+ },
+ {
+ field: "outMESOrderStatus",
+ title: "鐢熶骇璁㈠崟鐘舵��",
+ type: "int",
+ width: 150,
+ align: "left",
+ bind: { key: "outboundStatusEnum", data: [] },
+ },
+ {
+ field: "planDate",
+ title: "璁″垝棰嗘枡鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "endDate",
+ title: "缁撴潫棰嗘枡鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "assignTotalUsage",
+ title: "宸插垎閰嶉渶姹傛暟閲�",
+ type: "decimal",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "outTotalUsage",
+ title: "宸插嚭闇�姹傛暟閲�",
+ type: "decimal",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "",
+ table: "",
+ columns: [],
+ sortName: "",
+ key: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs"
index f3d1a28..2b59d44 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs"
@@ -761,6 +761,32 @@
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
+ case "outOrderTypeEnum":
+ {
+ List<object> data = new List<object>();
+ {
+ Type type = typeof(OutOrderTypeEnum);
+ List<int> enums = Enum.GetValues(typeof(OutOrderTypeEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(OutOrderTypeEnum).GetField(((OutOrderTypeEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+ }
+
+ result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
+ }
+ break;
}
return result;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json"
index 75c0435..01d9579 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json"
@@ -6,7 +6,7 @@
"Microsoft.AspNetCore": "Warning"
}
},
- "dics": "materielInvOrgEnum,agvStationAreaEnum,inboundState,createType,enableEnum,enableStatusEnum,locationStatusEnum,locationTypeEnum,taskStatusEnum,outboundStatusEnum,stockStatusEmun,stockChangeType,outStockStatus,authorityScope,authorityScopes,locationChangeType,warehouses,taskType,printStatus,outLockStockStatusEnum,proStockAttributeEnum,materielSourceTypeEnum,materielTypeEnum,materielUnitEnum,printAreaEnum,inOrderTypeEnum",
+ "dics": "materielInvOrgEnum,agvStationAreaEnum,inboundState,createType,enableEnum,enableStatusEnum,locationStatusEnum,locationTypeEnum,taskStatusEnum,outboundStatusEnum,stockStatusEmun,stockChangeType,outStockStatus,authorityScope,authorityScopes,locationChangeType,warehouses,taskType,printStatus,outLockStockStatusEnum,proStockAttributeEnum,materielSourceTypeEnum,materielTypeEnum,materielUnitEnum,printAreaEnum,inOrderTypeEnum,outOrderTypeEnum",
"AllowedHosts": "*",
"ConnectionStringsEncryption": false,
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
--
Gitblit v1.9.3