From aadc2a4fe5e62be74044acbb75549ef08a2d1c5d Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期四, 24 四月 2025 09:40:37 +0800
Subject: [PATCH] 预选，车轴上架记录
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Debug/net6.0/WIDESEA_IStorageOutOrderServices.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Debug/net6.0/WIDESEA_IStorageTaskRepository.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/ToAPPService.cs | 7
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/OldWheelsStock/Dt_WheelsStock_Old.cs | 60 ++--
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_Old.vue | 1
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Debug/net6.0/WIDESEA_BusinessesRepository.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2 | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Debug/net6.0/WIDESEA_StorageOutOrderServices.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/DistributeWheels/SelectionWheels.cs | 4
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Debug/net6.0/WIDESEA_StorageBasicServices.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.csproj.CopyComplete | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Debug/net6.0/WIDESEA_StorageOutOrderRepository.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Debug/net6.0/WIDESEA_Common.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Debug/net6.0/WIDESEA_Repository.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Debug/net6.0/WIDESEA_Services.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/LevelChangeHelper.cs | 21 +
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Debug/net6.0/WIDESEA_IBusinessServices.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Debug/net6.0/WIDESEA_StorageTaskRepository.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Debug/net6.0/WIDESEA_StorageBasicRepository.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/SelectionWheels.vue | 94 +++++++
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Debug/net6.0/WIDESEA_IStorageBasicServices.csproj.CopyComplete | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Debug/net6.0/WIDESEA_Model.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Debug/net6.0/WIDESEA_IStorageOutOrderRepository.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Debug/net6.0/WIDESEA_IStorageBasicRepository.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.csproj.CopyComplete | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Debug/net6.0/WIDESEA_StorageTaskServices.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2 | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Debug/net6.0/WIDESEA_IStorageTaskServices.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Debug/net6.0/WIDESEA_IRepository.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Debug/net6.0/WIDESEA_IServices.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs | 391 +----------------------------
项目代码/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs | 170 ++++++------
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Debug/net6.0/WIDESEA_IBusinessesRepository.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Debug/net6.0/WIDESEA_BusinessServices.csproj.CopyComplete | 0
44 files changed, 263 insertions(+), 485 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin"
index d8b0467..bd373e8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin"
index 3d795ae..1d4f224 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2"
index 4914360..a239a0c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
index cd045f3..586cff5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_Old.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_Old.vue"
index 951c951..5fb504c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_Old.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_Old.vue"
@@ -46,6 +46,7 @@
//{ field: 'wheels_ID', title: '涓婚敭ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
{ field: 'wheel_code', title: '杞﹁疆鐮�', type: 'string', width: 150, align: 'left' },
{ field: 'locate', title: '搴撲綅鍙�', type: 'string', width: 110, align: 'left' },
+ { field: 'wheels_CurrentStatue', title: '鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "CurrentStatue", data: [] } },
//{ field: 'wheels_SequenceNum', title: '搴忓垪鍙�', type: 'string', width: 110, align: 'left', sort: true, link: true, },
//{ field: 'wheels_Num', title: '杞﹁疆鍙�', type: 'string', width: 110, align: 'left' },
//{ field: 'wheels_Type', title: '绫诲瀷(杞�/鐩�)', type: 'string', width: 110, align: 'left' },
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/SelectionWheels.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/SelectionWheels.vue"
new file mode 100644
index 0000000..87dfab1
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/SelectionWheels.vue"
@@ -0,0 +1,94 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/invoices/Dt_InboundOrder.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/stock/SelectionWheels.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'ID',
+ footer: "Foots",
+ cnName: '棰勯�変俊鎭�',
+ name: 'stock/SelectionWheels',
+ url: "/SelectionWheels/",
+ sortName: "ID"
+ });
+ const editFormFields = ref({
+ ID:"",
+ CLTM:"",
+ CZTM:"",
+ location:"",
+ });
+ const editFormOptions = ref([
+ [
+ { "title": "杞﹁疆鏉＄爜", "field": "CLTM", type: "text" },
+ ],
+ [
+ { "title": "杞﹁酱鏉＄爜", "field": "CZTM", type: "text" },
+
+ ],
+ [
+ { "title": "搴撲綅鍙�", "field": "location", type: "text" },
+
+ ]
+ ]);
+ const searchFormFields = ref({
+ ID:"",
+ cltm:"",
+ cztm:"",
+ location:"",
+
+ });
+ const searchFormOptions = ref([
+ [
+ { "title": "杞﹁疆鏉＄爜", "field": "cltm", type: "text" },
+ ],
+ [
+ { "title": "杞﹁酱鏉＄爜", "field": "cztm", type: "text" },
+
+ ],
+ [
+ { "title": "搴撲綅鍙�", "field": "location", type: "text" },
+
+ ]
+
+ ]);
+ const columns = ref([
+ { field: 'id', title: '涓婚敭ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
+ { field: 'cltm', title: '杞﹁疆鏉＄爜', type: 'string', width: 150, align: 'left' },
+ { field: 'cztm', title: '杞﹁酱鏉＄爜', type: 'string', width: 150, align: 'left' },
+ { field: 'location', title: '搴撲綅鍙�', type: 'string', width: 110, align: 'left' },
+ { field: 'whereFrom', title: '鏉ユ簮', type: 'string', width: 110, align: 'left' },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'date', sort: true, width: 100, 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/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
index e496b81..72d386e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
index 995275c..113a5a4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
index 8968413..1865f12 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
index 16f3eba..b4baac8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
index 51d1add..b293fc1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin"
index b130189..2b54f3c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Debug/net6.0/WIDESEA_BusinessServices.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Debug/net6.0/WIDESEA_BusinessServices.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Debug/net6.0/WIDESEA_BusinessServices.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Debug/net6.0/WIDESEA_BusinessesRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Debug/net6.0/WIDESEA_BusinessesRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Debug/net6.0/WIDESEA_BusinessesRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/LevelChangeHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/LevelChangeHelper.cs"
index 35854ce..6881148 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/LevelChangeHelper.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/LevelChangeHelper.cs"
@@ -54,5 +54,26 @@
afterLevel = "绛夌骇6";
return afterLevel;
}
+
+ public static string JkChangeType(string beforeLevel)
+ {
+ string afterLevel = string.Empty;
+
+ if (beforeLevel.Contains("鍘�"))
+ afterLevel = "妫�淇師鍨�";
+ if (beforeLevel.Contains("绛夌骇1"))
+ afterLevel = "妫�淇瓑绾�1";
+ if (beforeLevel.Contains("绛夌骇2"))
+ afterLevel = "妫�淇瓑绾�2";
+ if (beforeLevel.Contains("绛夌骇3"))
+ afterLevel = "妫�淇瓑绾�3";
+ if (beforeLevel.Contains("绛夌骇4"))
+ afterLevel = "妫�淇瓑绾�4";
+ if (beforeLevel.Contains("绛夌骇5"))
+ afterLevel = "妫�淇瓑绾�5";
+ if (beforeLevel.Contains("绛夌骇6"))
+ afterLevel = "妫�淇瓑绾�6";
+ return afterLevel;
+ }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Debug/net6.0/WIDESEA_Common.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Debug/net6.0/WIDESEA_Common.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Debug/net6.0/WIDESEA_Common.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Debug/net6.0/WIDESEA_IBusinessServices.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Debug/net6.0/WIDESEA_IBusinessServices.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Debug/net6.0/WIDESEA_IBusinessServices.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Debug/net6.0/WIDESEA_IBusinessesRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Debug/net6.0/WIDESEA_IBusinessesRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Debug/net6.0/WIDESEA_IBusinessesRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Debug/net6.0/WIDESEA_IRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Debug/net6.0/WIDESEA_IRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Debug/net6.0/WIDESEA_IRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Debug/net6.0/WIDESEA_IServices.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Debug/net6.0/WIDESEA_IServices.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Debug/net6.0/WIDESEA_IServices.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Debug/net6.0/WIDESEA_IStorageBasicRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Debug/net6.0/WIDESEA_IStorageBasicRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Debug/net6.0/WIDESEA_IStorageBasicRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Debug/net6.0/WIDESEA_IStorageBasicServices.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Debug/net6.0/WIDESEA_IStorageBasicServices.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Debug/net6.0/WIDESEA_IStorageBasicServices.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Debug/net6.0/WIDESEA_IStorageOutOrderRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Debug/net6.0/WIDESEA_IStorageOutOrderRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Debug/net6.0/WIDESEA_IStorageOutOrderRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Debug/net6.0/WIDESEA_IStorageOutOrderServices.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Debug/net6.0/WIDESEA_IStorageOutOrderServices.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Debug/net6.0/WIDESEA_IStorageOutOrderServices.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Debug/net6.0/WIDESEA_IStorageTaskRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Debug/net6.0/WIDESEA_IStorageTaskRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Debug/net6.0/WIDESEA_IStorageTaskRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Debug/net6.0/WIDESEA_IStorageTaskServices.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Debug/net6.0/WIDESEA_IStorageTaskServices.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Debug/net6.0/WIDESEA_IStorageTaskServices.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/DistributeWheels/SelectionWheels.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/DistributeWheels/SelectionWheels.cs"
index da3140f..a1401f6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/DistributeWheels/SelectionWheels.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/DistributeWheels/SelectionWheels.cs"
@@ -33,7 +33,7 @@
/// </summary>
[ImporterHeader(Name = "杞﹁酱鏉＄爜")]
[ExporterHeader(DisplayName = "杞﹁酱鏉＄爜")]
- [SugarColumn(ColumnName = "CLTM", Length = 50, ColumnDescription = "杞﹁酱鏉＄爜")]
+ [SugarColumn(ColumnName = "CZTM", Length = 50, ColumnDescription = "杞﹁酱鏉＄爜")]
public string CZTM { get; set; }
/// <summary>
@@ -49,7 +49,7 @@
/// </summary>
[ImporterHeader(Name = " 鏉ユ簮")]
[ExporterHeader(DisplayName = "鏉ユ簮")]
- [SugarColumn(ColumnName = "Location", Length = 20, ColumnDescription = "鏉ユ簮")]
+ [SugarColumn(ColumnName = "WhereFrom", Length = 20, ColumnDescription = "鏉ユ簮")]
public string WhereFrom { get; set; }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/OldWheelsStock/Dt_WheelsStock_Old.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/OldWheelsStock/Dt_WheelsStock_Old.cs"
index 8cf82af..ade86ea 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/OldWheelsStock/Dt_WheelsStock_Old.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/OldWheelsStock/Dt_WheelsStock_Old.cs"
@@ -16,15 +16,15 @@
/// <summary>
/// 涓婚敭
/// </summary>
- //[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- //public int Wheels_ID { get; set; }
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int Wheels_ID { get; set; }
/// <summary>
/// 杞﹁疆缂栧彿
/// </summary>
[ImporterHeader(Name = "杞﹁疆缂栧彿")]
[ExporterHeader(DisplayName = "杞﹁疆缂栧彿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞﹁疆缂栧彿")]
+ [SugarColumn(IsNullable = false,ColumnName = "wheel_code", Length = 50, ColumnDescription = "杞﹁疆缂栧彿")]
public string wheel_code { get; set; }
@@ -33,7 +33,7 @@
/// </summary>
[ImporterHeader(Name = "杞鍙�")]
[ExporterHeader(DisplayName = "杞鍙�")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞鍙�")]
+ [SugarColumn(IsNullable = false, ColumnName = "feedbackno", Length = 50, ColumnDescription = "杞鍙�")]
public string feedbackno { get; set; }
/// <summary>
@@ -41,7 +41,7 @@
/// </summary>
[ImporterHeader(Name = "杞︾粍鍙�")]
[ExporterHeader(DisplayName = "杞︾粍鍙�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞︾粍鍙�")]
+ [SugarColumn(IsNullable = false, ColumnName = "axes_code", Length = 20, ColumnDescription = "杞︾粍鍙�")]
public string axes_code { get; set; }
/// <summary>
@@ -49,7 +49,7 @@
/// </summary>
[ImporterHeader(Name = "鏂�/鏃�")]
[ExporterHeader(DisplayName = "鏂�/鏃�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鏂�/鏃�")]
+ [SugarColumn(IsNullable = false, ColumnName = "repair_item", Length = 20, ColumnDescription = "鏂�/鏃�")]
public string repair_item { get; set; }
/// <summary>
@@ -57,7 +57,7 @@
/// </summary>
[ImporterHeader(Name = "杞﹁疆绫诲埆(M/T)")]
[ExporterHeader(DisplayName = "杞﹁疆绫诲埆(M/T)")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞﹁疆绫诲埆(M/T)")]
+ [SugarColumn(IsNullable = false, ColumnName = "dqtz_state", Length = 20, ColumnDescription = "杞﹁疆绫诲埆(M/T)")]
public string dqtz_state { get; set; }
/// <summary>
@@ -65,7 +65,7 @@
/// </summary>
[ImporterHeader(Name = "杞﹁疆鍨嬪彿")]
[ExporterHeader(DisplayName = "杞﹁疆鍨嬪彿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞﹁疆鍨嬪彿")]
+ [SugarColumn(IsNullable = false, ColumnName = "axes_type", Length = 50, ColumnDescription = "杞﹁疆鍨嬪彿")]
public string axes_type { get; set; }
/// <summary>
@@ -73,7 +73,7 @@
/// </summary>
[ImporterHeader(Name = "姣傚瓟绛夌骇")]
[ExporterHeader(DisplayName = "姣傚瓟绛夌骇")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "姣傚瓟绛夌骇")]
+ [SugarColumn(IsNullable = false, ColumnName = "venderno", Length = 50, ColumnDescription = "姣傚瓟绛夌骇")]
public string venderno { get; set; }
/// <summary>
@@ -81,7 +81,7 @@
/// </summary>
[ImporterHeader(Name = "杞�/鐩樼被鍨�")]
[ExporterHeader(DisplayName = "杞�/鐩樼被鍨�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞�/鐩樼被鍨�")]
+ [SugarColumn(IsNullable = false, ColumnName = "bearing_type", Length = 20, ColumnDescription = "杞�/鐩樼被鍨�")]
public string bearing_type { get; set; }
/// <summary>
@@ -89,7 +89,7 @@
/// </summary>
[ImporterHeader(Name = "鍒跺姩鐩樻潗璐�")]
[ExporterHeader(DisplayName = "鍒跺姩鐩樻潗璐�")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍒跺姩鐩樻潗璐�")]
+ [SugarColumn(IsNullable = false, ColumnName = "matertextrue", Length = 50, ColumnDescription = "鍒跺姩鐩樻潗璐�")]
public string matertextrue { get; set; }
/// <summary>
@@ -97,7 +97,7 @@
/// </summary>
[ImporterHeader(Name = "杞﹀瀷")]
[ExporterHeader(DisplayName = "杞﹀瀷")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞﹀瀷")]
+ [SugarColumn(IsNullable = false, ColumnName = "model", Length = 20, ColumnDescription = "杞﹀瀷")]
public string model { get; set; }
/// <summary>
@@ -105,7 +105,7 @@
/// </summary>
[ImporterHeader(Name = "鍒堕�犲巶")]
[ExporterHeader(DisplayName = "鍒堕�犲巶")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍒堕�犲巶")]
+ [SugarColumn(IsNullable = false, ColumnName = "wheel_from", Length = 50, ColumnDescription = "鍒堕�犲巶")]
public string wheel_from { get; set; }
/// <summary>
@@ -113,7 +113,7 @@
/// </summary>
[ImporterHeader(Name = "閰嶅睘灞�")]
[ExporterHeader(DisplayName = "閰嶅睘灞�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "閰嶅睘灞�")]
+ [SugarColumn(IsNullable = false, ColumnName = "wheel_pan", Length = 20, ColumnDescription = "閰嶅睘灞�")]
public string wheel_pan { get; set; }
/// <summary>
@@ -121,7 +121,7 @@
/// </summary>
[ImporterHeader(Name = "杞瘋瀛旂洿寰�")]
[ExporterHeader(DisplayName = "杞瘋瀛旂洿寰�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞瘋瀛旂洿寰�")]
+ [SugarColumn(IsNullable = false, ColumnName = "zjj", Length = 20, ColumnDescription = "杞瘋瀛旂洿寰�")]
public string zjj { get; set; }
/// <summary>
@@ -129,7 +129,7 @@
/// </summary>
[ImporterHeader(Name = "棰勪及闀熶慨鍚庤疆寰勫��")]
[ExporterHeader(DisplayName = "棰勪及闀熶慨鍚庤疆寰勫��")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "棰勪及闀熶慨鍚庤疆寰勫��")]
+ [SugarColumn(IsNullable = false, ColumnName = "zszj", Length = 20, ColumnDescription = "棰勪及闀熶慨鍚庤疆寰勫��")]
public string zszj { get; set; }
/// <summary>
@@ -137,7 +137,7 @@
/// </summary>
[ImporterHeader(Name = "杞紭鍘�")]
[ExporterHeader(DisplayName = "杞紭鍘�")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞紭鍘�")]
+ [SugarColumn(IsNullable = false, ColumnName = "zcd", Length = 50, ColumnDescription = "杞紭鍘�")]
public string zcd { get; set; }
/// <summary>
@@ -145,14 +145,14 @@
/// </summary>
[ImporterHeader(Name = "杞磋/杞鍒跺姩鐩樺墿浣欑（鑰�")]
[ExporterHeader(DisplayName = "杞磋/杞鍒跺姩鐩樺墿浣欑（鑰�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞磋/杞鍒跺姩鐩樺墿浣欑（鑰�")]
+ [SugarColumn(IsNullable = false, ColumnName = "m_zdpzzj", Length = 20, ColumnDescription = "杞磋/杞鍒跺姩鐩樺墿浣欑（鑰�")]
public string m_zdpzzj { get; set; }
/// <summary>
/// 澶囨敞
/// </summary>
[ImporterHeader(Name = "澶囨敞")]
[ExporterHeader(DisplayName = "澶囨敞")]
- [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "澶囨敞")]
+ [SugarColumn(IsNullable = false, ColumnName = "remarks", Length = 100, ColumnDescription = "澶囨敞")]
public string remarks { get; set; }
/// <summary>
/// 淇濆吇鍛ㄦ湡鎻愰啋
@@ -160,7 +160,7 @@
[ImporterHeader(Name = "淇濆吇鍛ㄦ湡鎻愰啋")]
[ExporterHeader(DisplayName = "淇濆吇鍛ㄦ湡鎻愰啋")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "淇濆吇鍛ㄦ湡鎻愰啋")]
+ [SugarColumn(IsNullable = false, ColumnName = "mqtz_state", Length = 20, ColumnDescription = "淇濆吇鍛ㄦ湡鎻愰啋")]
public string mqtz_state { get; set; }
/// <summary>
@@ -168,7 +168,7 @@
/// </summary>
[ImporterHeader(Name = "涓婃淇濆吇鏃堕棿")]
[ExporterHeader(DisplayName = "涓婃淇濆吇鏃堕棿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "涓婃淇濆吇鏃堕棿")]
+ [SugarColumn(IsNullable = false, ColumnName = "dt_bearing_dx", Length = 50, ColumnDescription = "涓婃淇濆吇鏃堕棿")]
public string dt_bearing_dx { get; set; }
/// <summary>
@@ -176,7 +176,7 @@
/// </summary>
[ImporterHeader(Name = "涓嬫淇濆吇鏃堕棿")]
[ExporterHeader(DisplayName = "涓嬫淇濆吇鏃堕棿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "涓嬫淇濆吇鏃堕棿")]
+ [SugarColumn(IsNullable = false, ColumnName = "dt_rtn", Length = 50, ColumnDescription = "涓嬫淇濆吇鏃堕棿")]
public string dt_rtn { get; set; }
/// <summary>
@@ -185,7 +185,7 @@
[ImporterHeader(Name = "棰勪及杞緞鍊�")]
[ExporterHeader(DisplayName = "棰勪及杞緞鍊�")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "棰勪及杞緞鍊�")]
+ [SugarColumn(IsNullable = false, ColumnName = "Wheels_ygljz", Length = 50, ColumnDescription = "棰勪及杞緞鍊�")]
public string Wheels_ygljz { get; set; }
/// <summary>
@@ -193,7 +193,7 @@
/// </summary>
[ImporterHeader(Name = "鍏ュ簱鏃ユ湡")]
[ExporterHeader(DisplayName = "鍏ュ簱鏃ユ湡")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍏ュ簱鏃ユ湡")]
+ [SugarColumn(IsNullable = false, ColumnName = "dt_ins", Length = 50, ColumnDescription = "鍏ュ簱鏃ユ湡")]
public string dt_ins { get; set; }
/// <summary>
@@ -201,7 +201,7 @@
/// </summary>
[ImporterHeader(Name = "浜ゆ鏃ユ湡")]
[ExporterHeader(DisplayName = "浜ゆ鏃ユ湡")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "浜ゆ鏃ユ湡")]
+ [SugarColumn(IsNullable = false, ColumnName = "dt_detect", Length = 20, ColumnDescription = "浜ゆ鏃ユ湡")]
public string dt_detect { get; set; }
/// <summary>
@@ -209,7 +209,7 @@
/// </summary>
[ImporterHeader(Name = "浜ゆ浜�")]
[ExporterHeader(DisplayName = "浜ゆ浜�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "浜ゆ浜�")]
+ [SugarColumn(IsNullable = false, ColumnName = "wheel_type", Length = 20, ColumnDescription = "浜ゆ浜�")]
public string wheel_type { get; set; }
/// <summary>
@@ -217,7 +217,7 @@
/// </summary>
[ImporterHeader(Name = "鍏ュ簱浜�")]
[ExporterHeader(DisplayName = "鍏ュ簱浜�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍏ュ簱浜�")]
+ [SugarColumn(IsNullable = false, ColumnName = "dept_code", Length = 20, ColumnDescription = "鍏ュ簱浜�")]
public string dept_code { get; set; }
/// <summary>
@@ -225,7 +225,7 @@
/// </summary>
[ImporterHeader(Name = "澶囩敤鐘舵��1")]
[ExporterHeader(DisplayName = "澶囩敤鐘舵��1")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "澶囩敤鐘舵��1")]
+ [SugarColumn(IsNullable = false, ColumnName = "spare_state1", Length = 20, ColumnDescription = "澶囩敤鐘舵��1")]
public string spare_state1 { get; set; }
/// <summary>
@@ -233,7 +233,7 @@
/// </summary>
[ImporterHeader(Name = "璐т綅鍙�")]
[ExporterHeader(DisplayName = "璐т綅鍙�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璐т綅鍙�")]
+ [SugarColumn(IsNullable = false, ColumnName = "Locate", Length = 20, ColumnDescription = "璐т綅鍙�")]
public string Locate { get; set; }
/// <summary>
@@ -241,7 +241,7 @@
/// </summary>
[ImporterHeader(Name = "鐘舵��")]
[ExporterHeader(DisplayName = "鐘舵��")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐘舵��")]
+ [SugarColumn(IsNullable = false, ColumnName = "Wheels_CurrentStatue", Length = 50, ColumnDescription = "鐘舵��")]
public int? Wheels_CurrentStatue { get; set; } = 1;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Debug/net6.0/WIDESEA_Model.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Debug/net6.0/WIDESEA_Model.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Debug/net6.0/WIDESEA_Model.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Debug/net6.0/WIDESEA_Repository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Debug/net6.0/WIDESEA_Repository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Debug/net6.0/WIDESEA_Repository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Debug/net6.0/WIDESEA_Services.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Debug/net6.0/WIDESEA_Services.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Debug/net6.0/WIDESEA_Services.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs"
index 863eb06..3d4d78a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs"
@@ -9,7 +9,9 @@
using WIDESEA_Core.Helper;
using WIDESEA_DTO.WMS;
using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.GZ_ZC.DistributeWheels;
using WIDESEA_StorageBasicRepository;
+using WIDESEA_StorageBasicService;
namespace WIDESEA_StoragIntegrationServices
{
@@ -149,7 +151,7 @@
if (string.IsNullOrEmpty(level)) throw new Exception("绛夌骇杞崲澶辫触,璇锋鏌ユ帴鍙ｇ瓑绾у弬鏁�");
//level = leftLevel;
}
- else if ("rihgt".Equals(wheelsPosition))
+ else if ("right".Equals(wheelsPosition))
{
level = LevelChangeHelper.LevelChangeType(rightLevel);
if (string.IsNullOrEmpty(level)) throw new Exception("绛夌骇杞崲澶辫触,璇锋鏌ユ帴鍙ｇ瓑绾у弬鏁�");
@@ -363,10 +365,20 @@
_unitOfWorkManage.BeginTran(); //寮�鍚簨鍔�
+
+
_CZInfo_MesRepository.AddData(CZInfo_Mes); //娣诲姞杞﹁酱淇℃伅
_WheelsStockRepository.UpdateData(wheelsStocks); //鏇存柊搴撳瓨鏁版嵁
_locationRepository.UpdateData(locationInfos); //鏇存柊搴撲綅鏁版嵁
_taskRepository.AddData(listTask); //娣诲姞浠诲姟鏁版嵁
+ if(leftContainer != null)
+ {
+ _AxleshelfService.AddAxleshe(leftContainer, CZInfo_Mes,clxh, wheelsPosition, newOrOld); //娣诲姞杞﹁酱涓婃灦璁板綍
+ }
+ if (rightContainer != null)
+ {
+ _AxleshelfService.AddAxleshe(rightContainer, CZInfo_Mes,clxh,wheelsPosition,newOrOld); //娣诲姞杞﹁酱涓婃灦璁板綍
+ }
//涓嬪彂鍑哄簱浠诲姟缁橶CS
var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
@@ -398,6 +410,9 @@
_unitOfWorkManage.RollbackTran(); //鍥炴粴浜嬪姟
throw new Exception("WCS澶勭悊澶辫触");
}
+
+ _unitOfWorkManage.CommitTran(); //鎻愪氦浜嬪姟
+ content.OK($"杞﹁疆鍑哄簱浠诲姟涓嬪彂缁橶CS鎴愬姛.");
return content;
}
else
@@ -415,377 +430,7 @@
- public WebResponseContent SaveCZInfo2(SaveModel saveModel)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- //濡傚綋鍓嶅瓨鍦ㄦ湭寮�濮嬪叆搴撶殑杞﹁疆鎴栧埗鍔ㄧ洏鏁版嵁,鍒欑姝繚瀛樻柊鏁版嵁 浠ラ槻鏁版嵁娣蜂贡
- var waitInbound = _CZInfo_MesRepository.QueryFirst(x => x.CurrentStatue == "0");
- if (waitInbound != null)
- throw new Exception("褰撳墠瀛樺湪鏈紑濮嬪叆搴撶殑杞﹁酱鏁版嵁,璇峰厛涓婃灦鍚姩鍚庡啀淇濆瓨淇℃伅!");
-
- //杞﹁酱鏉＄爜
- string czCode = saveModel.MainData["cztm"].ToString();
- if (string.IsNullOrEmpty(czCode))
- throw new Exception($"杞﹁酱鏉＄爜涓嶈兘涓虹┖");
-
- //杞﹁酱鍙�
- string czh = saveModel.MainData["czh"].ToString();
- if (string.IsNullOrEmpty(czh))
- throw new Exception($"杞﹁酱鍙蜂笉鑳戒负绌�");
- //var clinfo = _InWheels_MesRepository.QueryFirst(x => x.Wheels_code == czCode);
- //if (clinfo != null) throw new Exception("杞﹁疆褰曞叆淇℃伅宸插瓨鍦�");
-
- //搴忓垪鍙�
- //string madeUnit = saveModel.MainData["xlh"].ToString();
- //杞鏉＄爜
- string ldtm = saveModel.MainData["ldtm"].ToString();
- //杞﹀瀷
- string Cartype = saveModel.MainData["chexing"].ToString();
- if (string.IsNullOrEmpty(Cartype)) throw new Exception("閫夐厤澶辫触锛氳溅杞磋溅鍨嬪弬鏁颁负绌�");
-
- //杞﹁酱鍨嬪彿
- string czxh = saveModel.MainData["czxh"].ToString();
-
- //杞﹁疆鍨嬪彿
- string clxh = saveModel.MainData["clxh"].ToString();
-
- //鍔ㄦ嫋灞炴��
- string mttype = saveModel.MainData["mttype"].ToString();
-
- //宸﹁疆搴х洿寰凙1
- string zlzA1 = saveModel.MainData["zlzA1"].ToString();
- //宸﹁疆搴х洿寰凙1
- string zlzA2 = saveModel.MainData["zlzA2"].ToString();
- //宸﹁疆搴х洿寰凙1
- string zlzA3 = saveModel.MainData["zlzA3"].ToString();
- //宸﹁疆搴х洿寰凙
- string zlzA = saveModel.MainData["zlza"].ToString();
-
- //宸﹁疆搴х洿寰凚1
- string zlzB1 = saveModel.MainData["zlzB1"].ToString();
- //宸﹁疆搴х洿寰凚1
- string zlzB2 = saveModel.MainData["zlzB2"].ToString();
- //宸﹁疆搴х洿寰凚1
- string zlzB3 = saveModel.MainData["zlzB3"].ToString();
- //宸﹁疆搴х洿寰凚
- string zlzB = saveModel.MainData["zlzb"].ToString();
-
- //宸﹁疆搴х洿寰凜1
- string zlzC1 = saveModel.MainData["zlzC1"].ToString();
- //宸﹁疆搴х洿寰凜1
- string zlzC2 = saveModel.MainData["zlzC2"].ToString();
- //宸﹁疆搴х洿寰凜1
- string zlzC3 = saveModel.MainData["zlzC3"].ToString();
- //宸﹁疆搴х洿寰凜
- string zlzC = saveModel.MainData["zlzc"].ToString();
-
- //鍙宠疆搴х洿寰凙1
- string ylzA1 = saveModel.MainData["ylzA1"].ToString();
- //鍙宠疆搴х洿寰凙1
- string ylzA2 = saveModel.MainData["ylzA2"].ToString();
- //鍙宠疆搴х洿寰凙1
- string ylzA3 = saveModel.MainData["ylzA3"].ToString();
- //鍙宠疆搴х洿寰凙
- string ylzA = saveModel.MainData["ylza"].ToString();
-
- //鍙宠疆搴х洿寰凚1
- string ylzB1 = saveModel.MainData["ylzB1"].ToString();
- //鍙宠疆搴х洿寰凚1
- string ylzB2 = saveModel.MainData["ylzB2"].ToString();
- //鍙宠疆搴х洿寰凚1
- string ylzB3 = saveModel.MainData["ylzB3"].ToString();
- //鍙宠疆搴х洿寰凚
- string ylzB = saveModel.MainData["ylzb"].ToString();
-
- //鍙宠疆搴х洿寰凜1
- string ylzC1 = saveModel.MainData["ylzC1"].ToString();
- //鍙宠疆搴х洿寰凜1
- string ylzC2 = saveModel.MainData["ylzC2"].ToString();
- //鍙宠疆搴х洿寰凜1
- string ylzC3 = saveModel.MainData["ylzC3"].ToString();
- //鍙宠疆搴х洿寰凜
- string ylzC = saveModel.MainData["ylzc"].ToString();
-
- //宸﹁疆搴х洿寰�
- string zlzzj = saveModel.MainData["zlzzj"].ToString();
- //鍙宠疆搴х洿寰�
- string ylzzj = saveModel.MainData["ylzzj"].ToString();
-
- //鏂版棫
- string newOrOld = saveModel.MainData["NOdirection"].ToString();
- if (string.IsNullOrEmpty(newOrOld)) throw new Exception("鏈�夋嫨鏂版棫绫诲瀷,璇烽�夋嫨!");
-
- //杞﹁疆浣嶇疆
- string wheelsPosition = saveModel.MainData["wheelsPosition"].ToString();
- if (string.IsNullOrEmpty(wheelsPosition)) throw new Exception("鏈�夋嫨杞﹁疆浣嶇疆,璇烽�夋嫨!");
-
- //宸﹁疆绛夌骇
- string leftLevel = saveModel.MainData["zlzdj"].ToString();
- if (string.IsNullOrEmpty(leftLevel)) throw new Exception("閫夐厤澶辫触锛氳溅杞村乏杞骇绛夌骇鍙傛暟涓虹┖");
- //鍙宠疆绛夌骇
- string rightLevel = saveModel.MainData["ylzdj"].ToString();
- if (string.IsNullOrEmpty(rightLevel)) throw new Exception("閫夐厤澶辫触锛氳溅杞村彸杞骇绛夌骇鍙傛暟涓虹┖");
-
- //缁翠慨浠诲姟
- string wxrw = saveModel.MainData["wxrw"].ToString();
- if (string.IsNullOrEmpty(wxrw)) throw new Exception("閫夐厤澶辫触锛氱淮淇换鍔″弬鏁颁负绌�");
-
- string level = string.Empty;
- //string rightlevel = string.Empty;
- if ("all".Equals(wheelsPosition))
- {
- level = LevelChangeHelper.LevelChangeType(leftLevel);
- if (string.IsNullOrEmpty(level)) throw new Exception("绛夌骇杞崲澶辫触,璇锋鏌ユ帴鍙ｇ瓑绾у弬鏁�");
- }
- else if ("left".Equals(wheelsPosition))
- {
- level = LevelChangeHelper.LevelChangeType(leftLevel);
- if (string.IsNullOrEmpty(level)) throw new Exception("绛夌骇杞崲澶辫触,璇锋鏌ユ帴鍙ｇ瓑绾у弬鏁�");
- //level = leftLevel;
- }
- else if ("rihgt".Equals(wheelsPosition))
- {
- level = LevelChangeHelper.LevelChangeType(rightLevel);
- if (string.IsNullOrEmpty(level)) throw new Exception("绛夌骇杞崲澶辫触,璇锋鏌ユ帴鍙ｇ瓑绾у弬鏁�");
- //level = rightLevel;
- }
-
- string rw = CheckTaskChangeHelper.CheckTaskChange(wxrw);
- if (string.IsNullOrEmpty(rw)) throw new Exception("缁翠慨浠诲姟杞崲澶辫触,璇锋鏌ョ淮淇换鍔″弬鏁�");
-
- if (rw != newOrOld) throw new Exception("閫夐厤澶辫触:閫夐厤鏂版棫杞笌缁翠慨浠诲姟瑙ｆ瀽涓嶄竴鑷�");
-
- Dt_SelectionStandards selectionStandards = _SelectionStandardsRepository.QueryFirst(x => x.CarType.Contains(Cartype) && x.mttype == mttype && x.neworold == newOrOld && level.Contains(x.gkdj));
- if (selectionStandards == null) throw new Exception($"姝よ溅鍨媨Cartype}鐨勯�夐厤鏍囧噯寮傚父,璇锋牳瀵归�夐厤鏍囧噯淇℃伅!");
-
- Dt_CZInfo_mes CZInfo_Mes = new Dt_CZInfo_mes
- {
- CZTM = czCode,
- CHEXING = Cartype,
- CreateDate = DateTime.Now,
- Creater = "admin",
- CurrentStatue = "1",
- CZH = czh,
- CZXH = czxh,
- LDTM = ldtm,
- MTTYPE = mttype,
- ZLZA1 = zlzA1,
- ZLZA2 = zlzA2,
- ZLZA3 = zlzA3,
- ZLZA = zlzA,
- ZLZB1 = zlzB1,
- ZLZB2 = zlzB2,
- ZLZB3 = zlzB3,
- ZLZB = zlzB,
- ZLZC1 = zlzC1,
- ZLZC2 = zlzC2,
- ZLZC3 = zlzC3,
- ZLZC = zlzC,
- YLZA1 = ylzA1,
- YLZA2 = ylzA2,
- YLZA3 = ylzA3,
- YLZA = ylzA,
- YLZB1 = ylzB1,
- YLZB2 = ylzB2,
- YLZB3 = ylzB3,
- YLZB = ylzB,
- YLZC1 = ylzC1,
- YLZC2 = ylzC2,
- YLZC3 = ylzC3,
- YLZC = ylzC,
- ZLZZJ = zlzzj,
- YLZZJ = ylzzj,
- ZLZDJ = leftLevel,
- YLZDJ = rightLevel,
- WXRW = wxrw
- };
-
- //宸﹀嚭搴撹溅杞�
- Dt_WheelsStock leftContainer = null;
- //鍙冲嚭搴撹溅杞�
- Dt_WheelsStock rightContainer = null;
-
- //宸﹀嚭搴撹溅杞�
- Dt_WheelsStock_Old leftContainer2 = null;
- //鍙冲嚭搴撹溅杞�
- Dt_WheelsStock_Old rightContainer2 = null;
-
-
- //鍚屾俯鏃堕棿
- var hourpara = _configService.GetByConfigKey(CateGoryConst.CONFIG_SYS_Parameters, SysConfigConst.TempHour);
- int hour = hourpara.ConfigValue.ObjToInt();
-
- int knum = 1;
-
-
- //鎵惧嚭鎵�鏈夌鍚堟潯浠剁殑搴撳瓨杞﹁疆
- var WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now);
- if (null != WheelsList && WheelsList.Count > 0)
- {
- knum = 2;
- }
- var Wheelsdata=dt_WheelsStock_OldRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.dqtz_state == CZInfo_Mes.MTTYPE && x.axes_type == clxh && x.repair_item == newOrOld);
- if (null != Wheelsdata && Wheelsdata.Count > 0)
- {
- knum = 3;
- }
-
-
- //x.Wheels_CarType == CZInfo_Mes.CHEXING && x.Wheels_ldtm == CZInfo_Mes.LDTM && selectionStandards.CarType.Contains(x.Wheels_CarType)
- if (knum!=1)
- {
- if ("all".Equals(wheelsPosition) || string.IsNullOrEmpty(wheelsPosition))
- {
- if (null == leftContainer)
- {
- if(knum==2)
- {
- leftContainer = _WheelsStockService.GetSelectionWheelsStock(WheelsList, selectionStandards, CZInfo_Mes, "left", newOrOld);
- if (null != leftContainer)
- WheelsList.Remove(leftContainer);
- }
-
- if (knum == 3)
- {
- leftContainer2 = _WheelsStockService.GetSelectionWheels(Wheelsdata, selectionStandards, CZInfo_Mes, "left", newOrOld);
- if (null != leftContainer2)
- Wheelsdata.Remove(leftContainer2);
- }
-
- }
- if (null == rightContainer)
- {
- if(knum ==2)
- {
- rightContainer = _WheelsStockService.GetSelectionWheelsStock(WheelsList, selectionStandards, CZInfo_Mes, "right", newOrOld);
- if (null != rightContainer)
- WheelsList.Remove(rightContainer);
- }
-
- if(knum == 3)
- {
- rightContainer2 = _WheelsStockService.GetSelectionWheels(Wheelsdata, selectionStandards, CZInfo_Mes, "right", newOrOld);
- if (null != rightContainer2)
- Wheelsdata.Remove(rightContainer2);
- }
-
- }
- //if (null == leftContainer || null == rightContainer)
- }
- else if ("left".Equals(wheelsPosition))
- {
- if (knum == 2)
- {
- leftContainer = _WheelsStockService.GetSelectionWheelsStock(WheelsList, selectionStandards, CZInfo_Mes, "left", newOrOld);
- }
- if (knum == 3)
- {
- leftContainer2 = _WheelsStockService.GetSelectionWheels(Wheelsdata, selectionStandards, CZInfo_Mes, "left", newOrOld);
- }
-
- //if (null == leftContainer)
- }
- else if ("right".Equals(wheelsPosition))
- {
- if (knum == 2)
- {
- rightContainer = _WheelsStockService.GetSelectionWheelsStock(WheelsList, selectionStandards, CZInfo_Mes, "right", newOrOld);
- }
- if (knum == 3)
- {
- rightContainer2 = _WheelsStockService.GetSelectionWheels(Wheelsdata, selectionStandards, CZInfo_Mes, "right", newOrOld);
- }
- //if (null == rightContainer)
- }
- }
-
- if ("all".Equals(wheelsPosition))
- {
- if (knum == 2)
- {
- if (null == leftContainer || null == rightContainer)
- return content.Error("鏈壘鍒颁袱渚у彲鍖归厤鐨勫嚭搴撹溅杞�,杞﹀瀷锛�" + Cartype);
- }
- if (knum == 3)
- {
- if (null == leftContainer2 || null == rightContainer2)
- return content.Error("鏈壘鍒颁袱渚у彲鍖归厤鐨勫嚭搴撹溅杞�,杞﹀瀷锛�" + Cartype);
- }
- }
-
- if (knum == 2)
- {
- if (null != leftContainer || null != rightContainer)
- {
- List<Dt_WheelsStock> wheelsStocks = new List<Dt_WheelsStock>();
- if (null != leftContainer)
- {
- leftContainer.Wheels_CurrentStatue = 3;
-
- wheelsStocks.Add(leftContainer);
- }
- if (null != rightContainer)
- {
- rightContainer.Wheels_CurrentStatue = 3;
- wheelsStocks.Add(rightContainer);
- }
-
- _unitOfWorkManage.BeginTran(); //寮�鍚簨鍔�
-
- _WheelsStockRepository.UpdateData(wheelsStocks); //鏇存柊搴撳瓨鏁版嵁
-
- return content;
- }
- else
- {
- _unitOfWorkManage.RollbackTran(); //鍥炴粴浜嬪姟
- return content.Error("鏈壘鍒板彲鍖归厤鐨勫嚭搴撹溅杞�,杞﹀瀷锛�" + Cartype);
- }
- }
- else if (knum == 3)
- {
- if (null != leftContainer2 || null != rightContainer2)
- {
- List<Dt_WheelsStock_Old> wheelsStocks = new List<Dt_WheelsStock_Old>();
- if (null != leftContainer2)
- {
- leftContainer2.Wheels_CurrentStatue = 3;
-
- wheelsStocks.Add(leftContainer2);
- }
- if (null != rightContainer2)
- {
- rightContainer2.Wheels_CurrentStatue = 3;
- wheelsStocks.Add(rightContainer2);
- }
-
- _unitOfWorkManage.BeginTran(); //寮�鍚簨鍔�
-
- dt_WheelsStock_OldRepository.UpdateData(wheelsStocks); //鏇存柊搴撳瓨鏁版嵁
-
- return content;
- }
- else
- {
- _unitOfWorkManage.RollbackTran(); //鍥炴粴浜嬪姟
- return content.Error("鏈壘鍒板彲鍖归厤鐨勫嚭搴撹溅杞�,杞﹀瀷锛�" + Cartype);
- }
- }
- else
- {
- return content.Error("鏈壘鍒板彲鍖归厤鐨勫嚭搴撹溅杞�,杞﹀瀷锛�" + Cartype);
- }
-
-
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error($"涓婃灦澶辫触:{ex.Message}");
- }
- }
+
private Dt_Task CreateOutTask(Dt_WheelsStock wheelsStock, string CZTM)
{
CheckInfo checkInfo = new CheckInfo()
@@ -826,5 +471,7 @@
};
return task;
}
+
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/ToAPPService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/ToAPPService.cs"
index e0855a1..317d865 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/ToAPPService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/ToAPPService.cs"
@@ -28,10 +28,13 @@
private readonly IDt_WheelsStockService _WheelsStockService;
private readonly IDt_CZInfo_mesRepository _CZInfo_MesRepository;
private readonly IDt_WheelsStock_OldRepository dt_WheelsStock_OldRepository;
+ private readonly ISelectionWheelsRepository _SelectionWheelsRepository;
+ private readonly IDt_AxleshelfService _AxleshelfService;
+
private readonly IUnitOfWorkManage _unitOfWorkManage;
- public ToAPPService(ILocationInfoRepository locationRepository, IDt_TaskRepository taskRepository, ISys_ConfigService configService, IDt_InWheels_mesRepository inWheels_MesRepository, IDt_WheelsStockRepository wheelsStockRepository, IDt_SelectionStandardsRepository selectionStandardsRepository, IDt_WheelsStockService wheelsStockService, IDt_CZInfo_mesRepository cZInfo_MesRepository, IUnitOfWorkManage unitOfWorkManage, IDt_WheelsStock_OldRepository dt_WheelsStock_OldRepository)
+ public ToAPPService(ILocationInfoRepository locationRepository, IDt_TaskRepository taskRepository, ISys_ConfigService configService, IDt_InWheels_mesRepository inWheels_MesRepository, IDt_WheelsStockRepository wheelsStockRepository, IDt_SelectionStandardsRepository selectionStandardsRepository, IDt_WheelsStockService wheelsStockService, IDt_CZInfo_mesRepository cZInfo_MesRepository, IUnitOfWorkManage unitOfWorkManage, IDt_WheelsStock_OldRepository dt_WheelsStock_OldRepository, ISelectionWheelsRepository selectionWheelsRepository, IDt_AxleshelfService axleshelfService)
{
_InWheels_MesRepository = inWheels_MesRepository;
_locationRepository = locationRepository;
@@ -43,6 +46,8 @@
_CZInfo_MesRepository = cZInfo_MesRepository;
_unitOfWorkManage = unitOfWorkManage;
this.dt_WheelsStock_OldRepository = dt_WheelsStock_OldRepository;
+ _SelectionWheelsRepository = selectionWheelsRepository;
+ _AxleshelfService = axleshelfService;
}
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Debug/net6.0/WIDESEA_StorageBasicRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Debug/net6.0/WIDESEA_StorageBasicRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Debug/net6.0/WIDESEA_StorageBasicRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
index c520dd4..5b67789 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
@@ -14,6 +14,7 @@
using WIDESEA_Common.ZY;
using Autofac.Core;
using NetTaste;
+using AngleSharp.Io;
namespace WIDESEA_StorageBasicService;
@@ -132,104 +133,113 @@
public Dt_WheelsStock_Old GetSelectionWheels(List<Dt_WheelsStock_Old> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld)
{
- //杩囩泩閲忎笂闄�
- decimal selectionUpperValue = selectionStandards.upperValue;
- //杩囩泩閲忎笅闄�
- decimal selectionLowerValue = selectionStandards.lowerValue;
-
- decimal mesStand = 0;
- string level = string.Empty;
-
-
- if ("left".Equals(wheelsPosition)) //鍖归厤宸﹁疆搴ц疆瀛�
+ try
{
- mesStand = decimal.Parse(CZInfo_Mes.ZLZZJ);
- level = LevelChangeHelper.LevelChangeType(CZInfo_Mes.ZLZDJ);
- wheelsStocks = wheelsStocks.Where(x => x.venderno == level && x.repair_item == newOrOld).ToList();
- }
- else //鍚﹀垯鍖归厤鍙宠疆搴ц疆瀛�
- {
- mesStand = decimal.Parse(CZInfo_Mes.YLZZJ);
- level = LevelChangeHelper.LevelChangeType(CZInfo_Mes.YLZDJ);
- wheelsStocks = wheelsStocks.Where(x => x.venderno == level && x.repair_item == newOrOld).ToList();
- }
- foreach (var item in wheelsStocks)
- {
- string Wheels_gkcc = "";
- string Wheels_gkzja = "";
- string Wheels_gkzjb = "";
- string Wheels_gkzjc = "";
+ //杩囩泩閲忎笂闄�
+ decimal selectionUpperValue = selectionStandards.upperValue;
+ //杩囩泩閲忎笅闄�
+ decimal selectionLowerValue = selectionStandards.lowerValue;
- SaveModel saveModel = new SaveModel();
- saveModel.MainData = new Dictionary<string, object>
+ decimal mesStand = 0;
+ string level = string.Empty;
+
+
+ if ("left".Equals(wheelsPosition)) //鍖归厤宸﹁疆搴ц疆瀛�
+ {
+ mesStand = decimal.Parse(CZInfo_Mes.ZLZZJ);
+ level = LevelChangeHelper.JkChangeType(CZInfo_Mes.YLZDJ);
+ wheelsStocks = wheelsStocks.Where(x => x.venderno== level && x.repair_item == newOrOld).ToList();
+ }
+ else //鍚﹀垯鍖归厤鍙宠疆搴ц疆瀛�
+ {
+ mesStand = decimal.Parse(CZInfo_Mes.YLZZJ);
+ level = LevelChangeHelper.JkChangeType(CZInfo_Mes.YLZDJ);
+
+ wheelsStocks = wheelsStocks.Where(x => x.venderno== level && x.repair_item == newOrOld).ToList();
+ }
+ foreach (var item in wheelsStocks)
+ {
+ string Wheels_gkcc = "";
+ string Wheels_gkzja = "";
+ string Wheels_gkzjb = "";
+ string Wheels_gkzjc = "";
+
+ SaveModel saveModel = new SaveModel();
+ saveModel.MainData = new Dictionary<string, object>
{
{ "cltm", item.wheel_code }
};
- WebResponseContent webResponse= _toZYService.ZY_GetCLInfo(saveModel);
- if (webResponse.Status)
- {
- var dta = JsonConvert.DeserializeObject<CLInfo_ZY>(webResponse.Data.ToString());
-
- Wheels_gkcc = dta.gkcc;
- // 姣傚瓟a鐣岄潰鍧囧��
- Wheels_gkzja = dta.GKZJA;
- //姣傚瓟b鐣岄潰鍧囧��
- Wheels_gkzjb = dta.GKZJB;
- //姣傚瓟c鐣岄潰鍧囧��
- Wheels_gkzjc = dta.GKZJC;
- }
-
- if(Wheels_gkcc !="" && Wheels_gkzja!="" && Wheels_gkzjb !="" && Wheels_gkzjc != "")
- {
- //鏌ュ嚭鏉ュ湪鑼冨洿涔嬪鐨勮繘琛屽垹闄�
- if (mesStand - (decimal.Parse(Wheels_gkcc)) < selectionLowerValue && mesStand - (decimal.Parse(Wheels_gkcc)) > selectionUpperValue)
+ WebResponseContent webResponse = _toZYService.ZY_GetCLInfo(saveModel);
+ if (webResponse.Status)
{
+ CLInfo_ZY data = (CLInfo_ZY)webResponse.Data;
- wheelsStocks.Remove(item);
+ Wheels_gkcc = data.gkcc;
+ // 姣傚瓟a鐣岄潰鍧囧��
+ Wheels_gkzja = data.GKZJA;
+ //姣傚瓟b鐣岄潰鍧囧��
+ Wheels_gkzjb = data.GKZJB;
+ //姣傚瓟c鐣岄潰鍧囧��
+ Wheels_gkzjc = data.GKZJC;
}
- if (selectionStandards.isCantainGK)
+
+ if (Wheels_gkcc != "" && Wheels_gkzja != "" && Wheels_gkzjb != "" && Wheels_gkzjc != "")
{
- //鎴潰杩囩泩閲忎笂闄�
- decimal selectionUpperValue_gk = selectionStandards.upperValue_gk;
- //鎴潰杩囩泩閲忎笅闄�
- decimal selectionLowerValue_gk = selectionStandards.lowerValue_gk;
-
- if ("left".Equals(wheelsPosition))
+ //鏌ュ嚭鏉ュ湪鑼冨洿涔嬪鐨勮繘琛屽垹闄�
+ if (mesStand - (decimal.Parse(Wheels_gkcc)) < selectionLowerValue && mesStand - (decimal.Parse(Wheels_gkcc)) > selectionUpperValue)
{
- decimal ZLZA = decimal.Parse(CZInfo_Mes.ZLZA);
- decimal ZLZB = decimal.Parse(CZInfo_Mes.ZLZB);
- decimal ZLZC = decimal.Parse(CZInfo_Mes.ZLZC);
- //鍒ゆ柇鍙栧弽锛岃繘琛屽垹闄�
- if (ZLZA - (decimal.Parse(Wheels_gkzja)) < selectionLowerValue_gk && ZLZA - (decimal.Parse(Wheels_gkzja)) > selectionUpperValue_gk
- && ZLZB - (decimal.Parse(Wheels_gkzjb)) < selectionLowerValue_gk && ZLZB - (decimal.Parse(Wheels_gkzjb)) > selectionUpperValue_gk
- && ZLZC - (decimal.Parse(Wheels_gkzjc)) < selectionLowerValue_gk && ZLZC - (decimal.Parse(Wheels_gkzjc)) > selectionUpperValue_gk)
+ wheelsStocks.Remove(item);
+ }
+ if (selectionStandards.isCantainGK)
+ {
+ //鎴潰杩囩泩閲忎笂闄�
+ decimal selectionUpperValue_gk = selectionStandards.upperValue_gk;
+ //鎴潰杩囩泩閲忎笅闄�
+ decimal selectionLowerValue_gk = selectionStandards.lowerValue_gk;
+
+ if ("left".Equals(wheelsPosition))
{
- wheelsStocks.Remove(item);
+ decimal ZLZA = decimal.Parse(CZInfo_Mes.ZLZA);
+ decimal ZLZB = decimal.Parse(CZInfo_Mes.ZLZB);
+ decimal ZLZC = decimal.Parse(CZInfo_Mes.ZLZC);
+
+ //鍒ゆ柇鍙栧弽锛岃繘琛屽垹闄�
+ if (ZLZA - (decimal.Parse(Wheels_gkzja)) < selectionLowerValue_gk && ZLZA - (decimal.Parse(Wheels_gkzja)) > selectionUpperValue_gk
+ && ZLZB - (decimal.Parse(Wheels_gkzjb)) < selectionLowerValue_gk && ZLZB - (decimal.Parse(Wheels_gkzjb)) > selectionUpperValue_gk
+ && ZLZC - (decimal.Parse(Wheels_gkzjc)) < selectionLowerValue_gk && ZLZC - (decimal.Parse(Wheels_gkzjc)) > selectionUpperValue_gk)
+ {
+ wheelsStocks.Remove(item);
+ }
+ }
+ else
+ {
+ decimal YLZA = decimal.Parse(CZInfo_Mes.YLZA);
+ decimal YLZB = decimal.Parse(CZInfo_Mes.YLZB);
+ decimal YLZC = decimal.Parse(CZInfo_Mes.YLZC);
+
+ if (YLZA - (decimal.Parse(Wheels_gkzja)) >= selectionLowerValue_gk && YLZA - (decimal.Parse(Wheels_gkzja)) <= selectionUpperValue_gk
+ && YLZB - (decimal.Parse(Wheels_gkzjb)) >= selectionLowerValue_gk && YLZB - (decimal.Parse(Wheels_gkzjb)) <= selectionUpperValue_gk
+ && YLZC - (decimal.Parse(Wheels_gkzjc)) >= selectionLowerValue_gk && YLZC - (decimal.Parse(Wheels_gkzjc)) <= selectionUpperValue_gk)
+ {
+ wheelsStocks.Remove(item);
+ }
+
+
}
}
- else
- {
- decimal YLZA = decimal.Parse(CZInfo_Mes.YLZA);
- decimal YLZB = decimal.Parse(CZInfo_Mes.YLZB);
- decimal YLZC = decimal.Parse(CZInfo_Mes.YLZC);
-
- if (YLZA - (decimal.Parse(Wheels_gkzja)) >= selectionLowerValue_gk && YLZA - (decimal.Parse(Wheels_gkzja)) <= selectionUpperValue_gk
- && YLZB - (decimal.Parse(Wheels_gkzjb)) >= selectionLowerValue_gk && YLZB - (decimal.Parse(Wheels_gkzjb)) <= selectionUpperValue_gk
- && YLZC - (decimal.Parse(Wheels_gkzjc)) >= selectionLowerValue_gk && YLZC - (decimal.Parse(Wheels_gkzjc)) <= selectionUpperValue_gk)
- {
- wheelsStocks.Remove(item);
- }
-
-
- }
}
- }
-
+
+ }
+
+ return wheelsStocks.OrderBy(x => x.dt_ins).FirstOrDefault();
}
+ catch (Exception ex)
+ {
- return wheelsStocks.OrderBy(x => x.dt_ins).FirstOrDefault();
+ throw;
+ }
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Debug/net6.0/WIDESEA_StorageBasicServices.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Debug/net6.0/WIDESEA_StorageBasicServices.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Debug/net6.0/WIDESEA_StorageBasicServices.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Debug/net6.0/WIDESEA_StorageOutOrderRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Debug/net6.0/WIDESEA_StorageOutOrderRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Debug/net6.0/WIDESEA_StorageOutOrderRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Debug/net6.0/WIDESEA_StorageOutOrderServices.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Debug/net6.0/WIDESEA_StorageOutOrderServices.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Debug/net6.0/WIDESEA_StorageOutOrderServices.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Debug/net6.0/WIDESEA_StorageTaskRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Debug/net6.0/WIDESEA_StorageTaskRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Debug/net6.0/WIDESEA_StorageTaskRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Debug/net6.0/WIDESEA_StorageTaskServices.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Debug/net6.0/WIDESEA_StorageTaskServices.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Debug/net6.0/WIDESEA_StorageTaskServices.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.csproj.CopyComplete"
--
Gitblit v1.9.3