From 1267da8787d9f011786712f1e175ea6b7f1adbad Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期一, 07 四月 2025 15:12:24 +0800
Subject: [PATCH] 11
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 94 +++++++-------
/dev/null | 65 ----------
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj | 1
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/MOM/MOMErrorMessage.vue | 65 ++++++++++
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln | 30 +++++
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.MvcApplicationPartsAssemblyInfo.cs | 2
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/WIDESEA_IStoragIntegrationServices.csproj | 2
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/WIDESEA_StoragIntegrationRepository.csproj | 13 ++
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue | 18 +-
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 18 +-
Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js | 8
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/WIDESEA_IStoragIntegrationRepository.csproj | 13 ++
12 files changed, 193 insertions(+), 136 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
index c22340f..f306f76 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
@@ -32,7 +32,7 @@
roadway: "",
taskType:"",
taskState:"",
- wmsId:"",
+ wMSId:"",
sourceAddress: "",
targetAddress: "",
currentAddress: "",
@@ -57,7 +57,7 @@
const searchFormOptions = ref([
[
{ title: "浠诲姟鍙�", field: "taskNum", type: "int" },
- { title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
+ { title: "鎵樼洏缂栧彿", field: "palletCode", type: "text" },
{
title: "浠诲姟绫诲瀷",
field: "taskType",
@@ -74,15 +74,15 @@
},
],
[
- { title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
- { title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
- { title: "褰撳墠浣嶇疆", field: "currentAddress", type: "like" },
- { title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "like" },
+ { title: "璧峰鍦板潃", field: "sourceAddress", type: "text" },
+ { title: "鐩爣鍦板潃", field: "targetAddress", type: "text" },
+ { title: "褰撳墠浣嶇疆", field: "currentAddress", type: "text" },
+ { title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "text" },
],
[
- { title: "宸烽亾鍙�", field: "roadway", type: "like" },
+ { title: "宸烽亾鍙�", field: "roadway", type: "text" },
{ "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
- { title: "鍒涘缓浜�", field: "creater", type: "like" },
+ { title: "鍒涘缓浜�", field: "creater", type: "text" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
@@ -193,7 +193,7 @@
align: "left",
},
{
- field: "wmsId",
+ field: "wMSId",
title: "WMS浠诲姟涓婚敭",
type: "int",
width: 120,
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue
index a043770..3ba651f 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue
@@ -21,7 +21,7 @@
const table = ref({
key: "taskId",
footer: "Foots",
- cnName: "浠诲姟淇℃伅",
+ cnName: "浠诲姟鍘嗗彶淇℃伅",
name: "task_Hty",
url: "/Task_Hty/",
sortName: "CreateDate",
@@ -42,7 +42,7 @@
const searchFormOptions = ref([
[
{ title: "浠诲姟鍙�", field: "taskNum", type: "int" },
- { title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
+ { title: "鎵樼洏缂栧彿", field: "palletCode", type: "text" },
{
title: "浠诲姟绫诲瀷",
field: "taskType",
@@ -59,15 +59,15 @@
},
],
[
- { title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
- { title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
- { title: "褰撳墠浣嶇疆", field: "currentAddress", type: "like" },
- { title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "like" },
+ { title: "璧峰鍦板潃", field: "sourceAddress", type: "text" },
+ { title: "鐩爣鍦板潃", field: "targetAddress", type: "text" },
+ { title: "褰撳墠浣嶇疆", field: "currentAddress", type: "text" },
+ { title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "text" },
],
[
- { title: "宸烽亾鍙�", field: "roadway", type: "like" },
- { title: "鐢熶骇浜х嚎", field: "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
- { title: "鍒涘缓浜�", field: "creater", type: "like" },
+ { title: "宸烽亾鍙�", field: "roadway", type: "text" },
+ { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
+ { title: "鍒涘缓浜�", field: "creater", type: "text" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/MOM/MOMMessage.js b/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/MOM/MOMMessage.js
deleted file mode 100644
index 520ac40..0000000
--- a/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/MOM/MOMMessage.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/*****************************************************************************************
-** Author:jxx 2022
-** QQ:283591387
-**瀹屾暣鏂囨。瑙侊細http://v2.volcore.xyz/document/api 銆愪唬鐮佺敓鎴愰〉闈iewGrid銆�
-**甯哥敤绀轰緥瑙侊細http://v2.volcore.xyz/document/vueDev
-**鍚庡彴鎿嶄綔瑙侊細http://v2.volcore.xyz/document/netCoreDev
-*****************************************************************************************/
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() { //妗嗘灦鍒濆鍖栭厤缃墠锛�
- //绀轰緥锛氬湪鎸夐挳鐨勬渶鍓嶉潰娣诲姞涓�涓寜閽�
- // this.buttons.unshift({ //涔熷彲浠ョ敤push鎴栬�卻plice鏂规硶鏉ヤ慨鏀筨uttons鏁扮粍
- // name: '鎸夐挳', //鎸夐挳鍚嶇О
- // icon: 'el-icon-document', //鎸夐挳鍥炬爣vue2鐗堟湰瑙乮view鏂囨。icon锛寁ue3鐗堟湰瑙乪lement ui鏂囨。icon(娉ㄦ剰涓嶆槸element puls鏂囨。)
- // type: 'primary', //鎸夐挳鏍峰紡vue2鐗堟湰瑙乮view鏂囨。button锛寁ue3鐗堟湰瑙乪lement ui鏂囨。button
- // onClick: function () {
- // this.$Message.success('鐐瑰嚮浜嗘寜閽�');
- // }
- // });
-
- //绀轰緥锛氳缃慨鏀规柊寤恒�佺紪杈戝脊鍑烘瀛楁鏍囩鐨勯暱搴�
- this.boxOptions.labelWidth = 150;
- },
- onInited() {
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //this.detailOptions.columns.forEach(column=>{ });
- },
- searchBefore(param) {
- //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
- //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
- return true;
- },
- searchAfter(result) {
- //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
- return true;
- },
- addBefore(formData) {
- //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
- return true;
- },
- updateBefore(formData) {
- //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
- return true;
- },
- rowClick({ row, column, event }) {
- //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
- // this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
- },
- modelOpenAfter(row) {
- //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
- //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
- //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
- //(3)this.editFormFields.瀛楁='xxx';
- //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
- //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
- }
- }
- };
- export default extension;
-
\ No newline at end of file
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js b/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js
index bec3af3..9eccbca 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js
@@ -247,11 +247,11 @@
}
},{
- path: '/Message',
- name: 'Message',
- component: () => import('@/views/widesea_wms/MOM/ErrorMessage/Message.vue'),
+ path: '/MOMErrorMessage',
+ name: 'MOMErrorMessage',
+ component: () => import('@/views/widesea_wms/MOM/MOMErrorMessage.vue'),
meta: {
-
+ keepAlive: false
}
},
]
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/MOM/ErrorMessage/Message.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/MOM/ErrorMessage/Message.vue
deleted file mode 100644
index 58ed4ed..0000000
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/MOM/ErrorMessage/Message.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-*Author锛歫xx
- *Contact锛�283591387@qq.com
- *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
- *涓氬姟璇峰湪@/extension/widesea_wms/basicinfo/Dt_AreaInfo.js姝ゅ缂栧啓
- -->
- <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/widesea_wms/MOM/MOMMessage.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: 'id',
- footer: "Foots",
- cnName: 'MOM娑堟伅',
- name: 'MOM/MOMErrorMessage',
- url: "/MOMErrorMessage/",
- sortName: "CreateTime"
- });
- const editFormFields = ref({});
- const editFormOptions = ref([]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([
- [
- { "title": "鎵樼洏鍙�", "field": "palletCode", type: "text" },
- { "title": "浠诲姟鍙�", "field": "taskNum", type: "text" , hidden: true},
- { "title": "寮傚父娑堟伅", "field": "errorMessage", type: "text" },
- ],
- [
- { "title": "api鍚嶇О", "field": "apiName", type: "text" },
- { "title": "鍒涘缓鏃堕棿", "field": "createTime", type: "text" },
- ]
- ]);
- const columns = ref([{ field: 'id', title: '涓婚敭', type: 'int', sort: true, hidden: true, width: 110, readonly: true, require: true, align: 'left' },
- { field: 'taskNum', title: '浠诲姟鍙�', type: 'string', sort: true, width: 110, require: true, align: 'left', sort: true , hidden: true},
- { field: 'palletCode', title: '鎵樼洏鍙�', type: 'string', sort: true, width: 110, align: 'left' },
- { field: 'errorMessage', title: '寮傚父娑堟伅', type: 'string', sort: true, width: 200, align: 'left' },
- { field: 'apiName', title: 'api鍚嶇О', type: 'string', sort: true, width: 110, align: 'left' },
- { field: 'createTime', title: '鍒涘缓鏃堕棿', type: 'string', sort: true, width: 110, align: 'left' },]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "#detailTable",
- columns: [],
- sortName: "",
- key: ""
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/MOM/MOMErrorMessage.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/MOM/MOMErrorMessage.vue
new file mode 100644
index 0000000..54ba15d
--- /dev/null
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/MOM/MOMErrorMessage.vue
@@ -0,0 +1,65 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/taskinfo/Dt_Task.js姝ゅ缂栧啓
+ -->
+ <template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend" />
+</template>
+<script>
+import extend from "@/extension/widesea_wms/MOM/MOMErrorMessage.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'taskId',
+ footer: "Foots",
+ cnName: 'MOM寮傚父淇℃伅',
+ name: 'MOM/MOMErrorMessage',
+ url: "/MOMErrorMessage/",
+ sortName: "Id"
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+ });
+ const searchFormOptions = ref([
+ [
+ { "title": "鎵樼洏鍙�", "field": "palletCode", "type": "text" },
+ ],
+ ]);
+ const columns = ref([
+ { field: 'id', title: '涓婚敭', type: 'string', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
+ { field: 'taskNum', title: '浠诲姟鍙�', type: 'int', width: 60, align: 'left', sort: true },
+ { field: 'palletCode', title: '鎵樼洏鍙�', type: 'string', width: 100, align: 'left' },
+ { field: 'errorMessage', title: '寮傚父淇℃伅', type: 'string', width: 700, align: 'left' },
+ { field: 'apiName', title: '鎺ュ彛鍚嶇О', type: 'int', width: 110, align: 'left' },
+ { field: 'createTime', title: '鏃堕棿', type: 'datetime', width: 110, align: 'left' },
+]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/WIDESEA_IStoragIntegrationRepository.csproj b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/WIDESEA_IStoragIntegrationRepository.csproj
new file mode 100644
index 0000000..8b9ba57
--- /dev/null
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/WIDESEA_IStoragIntegrationRepository.csproj
@@ -0,0 +1,13 @@
+锘�<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEA_DTO\WIDESEA_DTO.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/WIDESEA_IStoragIntegrationServices.csproj b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/WIDESEA_IStoragIntegrationServices.csproj
index a70161f..8c50632 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/WIDESEA_IStoragIntegrationServices.csproj
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/WIDESEA_IStoragIntegrationServices.csproj
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <ProjectReference Include="..\WIDESEA_DTO\WIDESEA_DTO.csproj" />
+ <ProjectReference Include="..\WIDESEA_StoragIntegrationRepository\WIDESEA_StoragIntegrationRepository.csproj" />
</ItemGroup>
</Project>
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/WIDESEA_StoragIntegrationRepository.csproj b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/WIDESEA_StoragIntegrationRepository.csproj
new file mode 100644
index 0000000..dd4f343
--- /dev/null
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/WIDESEA_StoragIntegrationRepository.csproj
@@ -0,0 +1,13 @@
+锘�<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEA_IStoragIntegrationRepository\WIDESEA_IStoragIntegrationRepository.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln
index ddc6e1e..0c16bc8 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln
@@ -80,6 +80,10 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_Cache", "WIDESEA_Cache\WIDESEA_Cache.csproj", "{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_StoragIntegrationRepository", "WIDESEA_StoragIntegrationRepository\WIDESEA_StoragIntegrationRepository.csproj", "{B317068F-39F2-4E0E-9980-4C4A037C47BF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_IStoragIntegrationRepository", "WIDESEA_IStoragIntegrationRepository\WIDESEA_IStoragIntegrationRepository.csproj", "{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -450,6 +454,30 @@
{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Release|Any CPU.Build.0 = Release|Any CPU
{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Release|x86.ActiveCfg = Release|Any CPU
{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Release|x86.Build.0 = Release|Any CPU
+ {B317068F-39F2-4E0E-9980-4C4A037C47BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B317068F-39F2-4E0E-9980-4C4A037C47BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B317068F-39F2-4E0E-9980-4C4A037C47BF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B317068F-39F2-4E0E-9980-4C4A037C47BF}.Debug|x86.Build.0 = Debug|Any CPU
+ {B317068F-39F2-4E0E-9980-4C4A037C47BF}.Dev|Any CPU.ActiveCfg = Release|Any CPU
+ {B317068F-39F2-4E0E-9980-4C4A037C47BF}.Dev|Any CPU.Build.0 = Release|Any CPU
+ {B317068F-39F2-4E0E-9980-4C4A037C47BF}.Dev|x86.ActiveCfg = Release|Any CPU
+ {B317068F-39F2-4E0E-9980-4C4A037C47BF}.Dev|x86.Build.0 = Release|Any CPU
+ {B317068F-39F2-4E0E-9980-4C4A037C47BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B317068F-39F2-4E0E-9980-4C4A037C47BF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B317068F-39F2-4E0E-9980-4C4A037C47BF}.Release|x86.ActiveCfg = Release|Any CPU
+ {B317068F-39F2-4E0E-9980-4C4A037C47BF}.Release|x86.Build.0 = Release|Any CPU
+ {5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Debug|x86.Build.0 = Debug|Any CPU
+ {5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Dev|Any CPU.ActiveCfg = Release|Any CPU
+ {5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Dev|Any CPU.Build.0 = Release|Any CPU
+ {5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Dev|x86.ActiveCfg = Release|Any CPU
+ {5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Dev|x86.Build.0 = Release|Any CPU
+ {5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Release|x86.ActiveCfg = Release|Any CPU
+ {5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -481,6 +509,8 @@
{9912BD12-4CF7-4A91-8203-47C9C125004C} = {8498AA9D-CDC4-4FD2-81AE-DE6AD78F75ED}
{55326F38-372A-4606-B7FB-8C01BBAEC4FC} = {8498AA9D-CDC4-4FD2-81AE-DE6AD78F75ED}
{94D572FA-810E-4897-B673-AF988FD4019E} = {A73C1AFF-FF92-4825-B607-2E908077EBA4}
+ {B317068F-39F2-4E0E-9980-4C4A037C47BF} = {798C4C07-A3B2-47AD-A69C-922D5217B5CA}
+ {5BBF8BD2-3334-4793-87BF-48E1AC4CFD05} = {B131DEBD-A555-490B-B448-46425298E427}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {599A7267-7402-4143-84AE-9B407FC2BB69}
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj
index f91f8ef..66cde40 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj
@@ -20,7 +20,6 @@
</ItemGroup>
<ItemGroup>
- <None Include="Controllers\Basic\MOMErrorMessageController.cs" />
<None Include="wwwroot\WIDESEA_DB.DBSeed.Json\Sys_Tenant.tsv" />
<None Include="wwwroot\WIDESEA_DB.DBSeed.Json\Sys_User.tsv" />
</ItemGroup>
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
index 03a4520..068f2b0 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
@@ -1,53 +1,53 @@
{
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft.AspNetCore": "Warning"
- }
- },
- "AllowedHosts": "*",
- "urls": "http://*:5000",
- "MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
- //杩炴帴瀛楃涓�
- //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- //"ConnectionString": "Data Source=192.168.5.251;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- "ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WMS2F08;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WMSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionStringWCS": "Data Source=192.168.5.251;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- "ConnectionStringWCS": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCS2F09;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //璺ㄥ煙
- "Cors": {
- "PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
- "EnableAllIPs": true, //褰撲负true鏃讹紝寮�鏀炬墍鏈塈P鍧囧彲璁块棶銆�
- // 鏀寔澶氫釜鍩熷悕绔彛锛屾敞鎰忕鍙ｅ彿鍚庝笉瑕佸甫/鏂滄潌锛氭瘮濡俵ocalhost:8000/锛屾槸閿欑殑
- // 娉ㄦ剰锛宧ttp://127.0.0.1:1818 鍜� http://localhost:1818 鏄笉涓�鏍风殑
- "IPs": "http://127.0.0.1:8080,http://localhost:8080,http://127.0.0.1:8081,http://localhost:8081"
- },
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft.AspNetCore": "Warning"
+ }
+ },
+ "AllowedHosts": "*",
+ "urls": "http://*:5000",
+ "MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
+ //杩炴帴瀛楃涓�
+ //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
+ //"ConnectionString": "Data Source=192.168.5.251;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WMSDB;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ //"ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ //"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WMSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ //"ConnectionStringWCS": "Data Source=192.168.5.251;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionStringWCS": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ //璺ㄥ煙
+ "Cors": {
+ "PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
+ "EnableAllIPs": true, //褰撲负true鏃讹紝寮�鏀炬墍鏈塈P鍧囧彲璁块棶銆�
+ // 鏀寔澶氫釜鍩熷悕绔彛锛屾敞鎰忕鍙ｅ彿鍚庝笉瑕佸甫/鏂滄潌锛氭瘮濡俵ocalhost:8000/锛屾槸閿欑殑
+ // 娉ㄦ剰锛宧ttp://127.0.0.1:1818 鍜� http://localhost:1818 鏄笉涓�鏍风殑
+ "IPs": "http://127.0.0.1:8080,http://localhost:8080,http://127.0.0.1:8081,http://localhost:8081"
+ },
- //缂撳瓨璁剧疆
- "CacheSettings": {
- "UseRedis": true, //鍚敤redis
- "RedisSettings": {
- "Address": "127.0.0.1:6379", //鍦板潃
- "Password": "123456", //Redis鏈嶅姟瀵嗙爜
- "Db": 9, //榛樿搴�
- "ClearRedis": true //鏄惁姣忔鍚姩閮芥竻闄edis缂撳瓨
- }
- },
+ //缂撳瓨璁剧疆
+ "CacheSettings": {
+ "UseRedis": false, //鍚敤redis
+ "RedisSettings": {
+ "Address": "127.0.0.1:6379", //鍦板潃
+ "Password": "123456", //Redis鏈嶅姟瀵嗙爜
+ "Db": 9, //榛樿搴�
+ "ClearRedis": true //鏄惁姣忔鍚姩閮芥竻闄edis缂撳瓨
+ }
+ },
- "ApiName": "WIDESEA",
- "ExpMinutes": 120,
+ "ApiName": "WIDESEA",
+ "ExpMinutes": 120,
- // 闇�瑕佺Щ搴撶殑琛�
- "TransfertRows": "1,4,5,8",
+ // 闇�瑕佺Щ搴撶殑琛�
+ "TransfertRows": "1,4,5,8",
- // 鍏佽鍑哄簱鐨勭紪鐮�
- "OutBoundMateriel": [
- {
- "MaterielCode": "CC01050001523",
- "ProductionLine": "ZJ-7",
- "ProcessCode": "CH001"
- }
- ]
+ // 鍏佽鍑哄簱鐨勭紪鐮�
+ "OutBoundMateriel": [
+ {
+ "MaterielCode": "CC01050001523",
+ "ProductionLine": "ZJ-7",
+ "ProcessCode": "CH001"
+ }
+ ]
}
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.MvcApplicationPartsAssemblyInfo.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.MvcApplicationPartsAssemblyInfo.cs
index cd44a9d..cb2caeb 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.MvcApplicationPartsAssemblyInfo.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.MvcApplicationPartsAssemblyInfo.cs
@@ -30,6 +30,7 @@
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WIDESEA_IStorageOutOrderServices")]
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WIDESEA_IStorageTaskRepository")]
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WIDESEA_IStorageTaskServices")]
+[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WIDESEA_IStoragIntegrationRepository")]
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WIDESEA_IStoragIntegrationServices")]
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WIDESEA_Model")]
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WIDESEA_Repository")]
@@ -40,6 +41,7 @@
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WIDESEA_StorageOutOrderServices")]
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WIDESEA_StorageTaskRepository")]
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WIDESEA_StorageTaskServices")]
+[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WIDESEA_StoragIntegrationRepository")]
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WIDESEA_StoragIntegrationServices")]
// 鐢� MSBuild WriteCodeFragment 绫荤敓鎴愩��
--
Gitblit v1.9.3