预选，车轴上架记录

huanghongfeng

2025-04-24 aadc2a4fe5e62be74044acbb75549ef08a2d1c5d

预选，车轴上架记录

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo

Binary files differ

 ÏîÄ¿´úÂë/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' },

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/SelectionWheels.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,94 @@
<!--
*Author：jxx
 *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>

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Debug/net6.0/WIDESEA_BusinessServices.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Debug/net6.0/WIDESEA_BusinessesRepository.csproj.CopyComplete

 ÏîÄ¿´úÂë/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;
        }
    }
}

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Debug/net6.0/WIDESEA_Common.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Debug/net6.0/WIDESEA_IBusinessServices.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Debug/net6.0/WIDESEA_IBusinessesRepository.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Debug/net6.0/WIDESEA_IRepository.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Debug/net6.0/WIDESEA_IServices.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Debug/net6.0/WIDESEA_IStorageBasicRepository.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Debug/net6.0/WIDESEA_IStorageBasicServices.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Debug/net6.0/WIDESEA_IStorageOutOrderRepository.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Debug/net6.0/WIDESEA_IStorageOutOrderServices.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Debug/net6.0/WIDESEA_IStorageTaskRepository.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Debug/net6.0/WIDESEA_IStorageTaskServices.csproj.CopyComplete

 ÏîÄ¿´úÂë/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; }
    }
}

 ÏîÄ¿´úÂë/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;



 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Debug/net6.0/WIDESEA_Model.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Debug/net6.0/WIDESEA_Repository.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Debug/net6.0/WIDESEA_Services.csproj.CopyComplete

 ÏîÄ¿´úÂë/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);   //添加车轴上架记录
                    }

                    //下发出库任务给WCS
                    var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
@@ -398,6 +410,9 @@
                        _unitOfWorkManage.RollbackTran();  //回滚事务
                        throw new Exception("WCS处理失败");
                    }

                    _unitOfWorkManage.CommitTran();  //提交事务
                    content.OK($"车轮出库任务下发给WCS成功.");
                    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();

                //左轮座直径A1
                string zlzA1 = saveModel.MainData["zlzA1"].ToString();
                //左轮座直径A1
                string zlzA2 = saveModel.MainData["zlzA2"].ToString();
                //左轮座直径A1
                string zlzA3 = saveModel.MainData["zlzA3"].ToString();
                //左轮座直径A
                string zlzA = saveModel.MainData["zlza"].ToString();

                //左轮座直径B1
                string zlzB1 = saveModel.MainData["zlzB1"].ToString();
                //左轮座直径B1
                string zlzB2 = saveModel.MainData["zlzB2"].ToString();
                //左轮座直径B1
                string zlzB3 = saveModel.MainData["zlzB3"].ToString();
                //左轮座直径B
                string zlzB = saveModel.MainData["zlzb"].ToString();

                //左轮座直径C1
                string zlzC1 = saveModel.MainData["zlzC1"].ToString();
                //左轮座直径C1
                string zlzC2 = saveModel.MainData["zlzC2"].ToString();
                //左轮座直径C1
                string zlzC3 = saveModel.MainData["zlzC3"].ToString();
                //左轮座直径C
                string zlzC = saveModel.MainData["zlzc"].ToString();

                //右轮座直径A1
                string ylzA1 = saveModel.MainData["ylzA1"].ToString();
                //右轮座直径A1
                string ylzA2 = saveModel.MainData["ylzA2"].ToString();
                //右轮座直径A1
                string ylzA3 = saveModel.MainData["ylzA3"].ToString();
                //右轮座直径A
                string ylzA = saveModel.MainData["ylza"].ToString();

                //右轮座直径B1
                string ylzB1 = saveModel.MainData["ylzB1"].ToString();
                //右轮座直径B1
                string ylzB2 = saveModel.MainData["ylzB2"].ToString();
                //右轮座直径B1
                string ylzB3 = saveModel.MainData["ylzB3"].ToString();
                //右轮座直径B
                string ylzB = saveModel.MainData["ylzb"].ToString();

                //右轮座直径C1
                string ylzC1 = saveModel.MainData["ylzC1"].ToString();
                //右轮座直径C1
                string ylzC2 = saveModel.MainData["ylzC2"].ToString();
                //右轮座直径C1
                string ylzC3 = saveModel.MainData["ylzC3"].ToString();
                //右轮座直径C
                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;
        }

        
    }
}

 ÏîÄ¿´úÂë/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;
        }
    }
}

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Debug/net6.0/WIDESEA_StorageBasicRepository.csproj.CopyComplete

 ÏîÄ¿´úÂë/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;
        }
    }



 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Debug/net6.0/WIDESEA_StorageBasicServices.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Debug/net6.0/WIDESEA_StorageOutOrderRepository.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Debug/net6.0/WIDESEA_StorageOutOrderServices.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Debug/net6.0/WIDESEA_StorageTaskRepository.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Debug/net6.0/WIDESEA_StorageTaskServices.csproj.CopyComplete

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.csproj.CopyComplete