Admin
5 天以前 2ec5ea20a8104dbfc1897696a61609119ba645a9
最新
已修改19个文件
39 ■■■■■ 文件已修改
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_PreOutbound.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_PreOutbound_hty.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v9.bin 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db-shm 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db-wal 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-shm 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-wal 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/ToAPP/IToAPPService.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/APP/ToAPPController.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_PreOutbound.vue
@@ -39,7 +39,7 @@
    const editFormOptions = ref([
      [
        {
          title: "托盘编号",
          title: "车轮条码",
          field: "palletCode",
          type: "string",
        },
@@ -68,7 +68,7 @@
    });
    const searchFormOptions = ref([
      [
        { title: "托盘编号", field: "palletCode", type: "like" },
        { title: "车轮条码", field: "palletCode", type: "like" },
        { title: "状态", field: "stockStatus", type: "int" },
        //{ title: "类型", field: "wheels_Type", type: "int" },
        { title: "备注", field: "remark", type: "like" },
@@ -90,7 +90,7 @@
      },
      {
        field: "palletCode",
        title: "托盘编号",
        title: "车轮条码",
        type: "string",
        width: 100,
        align: "left",
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_PreOutbound_hty.vue
@@ -39,7 +39,7 @@
    const editFormOptions = ref([
      [
        {
          title: "托盘编号",
          title: "车轮条码",
          field: "palletCode",
          type: "string",
        },
@@ -68,7 +68,7 @@
    });
    const searchFormOptions = ref([
      [
        { title: "托盘编号", field: "palletCode", type: "like" },
        { title: "车轮条码", field: "palletCode", type: "like" },
        { title: "状态", field: "stockStatus", type: "int" },
        //{ title: "类型", field: "wheels_Type", type: "int" },
        { title: "备注", field: "remark", type: "like" },
@@ -90,7 +90,7 @@
      },
      {
        field: "palletCode",
        title: "托盘编号",
        title: "车轮条码",
        type: "string",
        width: 100,
        align: "left",
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock.vue
@@ -67,7 +67,6 @@
            { field: 'remark', title: '备注', type: 'string', width: 60, align: 'left' },
            { field: 'wheels_CurrentStatue', title: '状态', type: 'int', width: 110, align: 'left', bind: { key: "CurrentStatue", data: [] } },
            { field: 'wheels_gkcc', title: '毂孔均值', type: 'string', sort: true, width: 100, align: 'left' },
            { field: 'wheels_Num', title: '车轮条码', type: 'string', width: 120, align: 'left' },
            { field: 'wheels_ldtm', title: '轮对条码', type: 'string', width: 120, align: 'left' },
            { field: 'wheels_CarType', title: '车型', type: 'string', width: 70, align: 'left'  },
            { field: 'wheels_psj', title: '配属局', type: 'string',  width: 75, align: 'left' },
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v9.bin
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db-shm
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db-wal
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-shm
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-wal
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_IStoragIntegrationServices/ToAPP/IToAPPService.cs
@@ -1,4 +1,5 @@
using System;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -30,7 +31,7 @@
        WebResponseContent SaveZDPXPInfo(SaveModel saveModel);
        WebResponseContent SaveTemporaryissued();
        WebResponseContent SaveTemporaryissued(SaveModel saveModel);
    }
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs
@@ -284,7 +284,17 @@
                        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 && x.WheelsProps == wheelsProps && (x.Wheels_CarType == "CRH1C" || x.Wheels_CarType == "CRH1A-A") && x.Wheels_Statue == 0);
                    }
                }
                else if (clxh == "GBDW21A" || clxh == "GBDW11A" || clxh == "GBTW21A" || clxh == "GBTW11A")
                {
                    if (CZInfo_Mes.MTTYPE == "T" && (clxh == "GBTW21A" || clxh == "GBTW11A"))
                    {
                        WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_CarType == Cartype && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.Wheels_Statue == 0);
                    }
                    else
                    {
                        WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_CarType == Cartype && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && x.Wheels_Statue == 0);
                    }
                }
                else
                {
                    if (CZInfo_Mes.MTTYPE == "T")
@@ -468,7 +478,8 @@
                            WheelsNewOrOld = rightContainer.Wheels_NewOrOld,
                            wheels_gkcc = rightContainer.Wheels_gkcc,
                            wheels_mttype = rightContainer.Wheels_mttype,
                            WheelsLX = rightContainer.Wheels_ldxh
                            WheelsLX = rightContainer.Wheels_ldxh,
                            axle_czh= czCode,
                        };
                        listTask.Add(rightTask);
                        listTaskDTO.Add(rihgtTaskDTO);
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/APP/ToAPPController.cs
@@ -123,9 +123,9 @@
    /// æš‚存库下发任务
    /// </summary>
    /// <returns></returns>
    [HttpGet, Route("SaveTemporaryissued"), AllowAnonymous]
    public WebResponseContent SaveTemporaryissued()
    [HttpPost, Route("SaveTemporaryissued"), AllowAnonymous]
    public WebResponseContent SaveTemporaryissued([FromBody] SaveModel saveModel)
    {
        return _AppService.SaveTemporaryissued();
        return _AppService.SaveTemporaryissued(saveModel);
    }
}