1

huangxiaoqiang

9 天以前 787cc88bd5655c701299f24a5779a908e51eeb0d

1

 Code Management/WCS/WIDESEAWCS_Client/src/api/http.js

@@ -11,16 +11,15 @@

let loadingInstance;
let loadingStatus = false;
if (process.env.NODE_ENV == 'development') {
     axios.defaults.baseURL = 'http://127.0.0.1:9291/';
if (process.env.NODE_ENV == 'development') {axios.defaults.baseURL = 'http://127.0.0.1:9291/';
    // axios.defaults.baseURL = 'http://192.168.20.251:9291/';
}
else if (process.env.NODE_ENV == 'debug') {
    axios.defaults.baseURL = 'http://127.0.0.1:8098/';
    axios.defaults.baseURL = 'http://192.168.15.253:9291/';
}

else if (process.env.NODE_ENV == 'production') {
    axios.defaults.baseURL = 'http://192.168.20.253:9291/';
    axios.defaults.baseURL = 'http://192.168.15.253:9291/';
}
if (!axios.defaults.baseURL.endsWith('/')) {
    axios.defaults.baseURL+="/";

 Code Management/WCS/WIDESEAWCS_Client/src/extension/ProcessParameters/extend/importDevicePro.vue

 Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js

@@ -1,4 +1,4 @@
import gridBody from "./extend/importDevicePro.vue";
import gridBody from '@/extension/ProcessParameters/extend/importDevicePro.vue';
let extension = {
  components: {
    //查询界面扩展组件

 Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/extend/importDevicePro.vue

copy from Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/extend/importDevicePro.vue
copy to Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/extend/importDevicePro.vue

 Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue

@@ -176,7 +176,7 @@
        type: "string",
        width: 90,
        align: "left",
        hidden: true,
       
      },
      {
        field: "grade",

 Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue

@@ -68,7 +68,7 @@
        { title: "巷道号", field: "roadway", type: "text" },
        { "title": "生产产线", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
        { title: "创建人", field: "creater", type: "text" },
        { title: "创建时间", field: "createDate", type: "datetime" },
        { title: "完成时间", field: "createDate", type: "datetime" },
      ],
    ]);
    const columns = ref([
@@ -161,7 +161,7 @@
        type: "string",
        width: 90,
        align: "left",
        hidden: true,
       
      },
      {
        field: "grade",
@@ -176,6 +176,7 @@
        type: "datetime",
        width: 150,
        align: "left",
        hidden: true,
      },
      {
        field: "wMSId",
@@ -188,7 +189,7 @@
      
      {
        field: "createDate",
        title: "创建时间",
        title: "完成时间",
        type: "datetime",
        width: 150,
        align: "left",
@@ -199,10 +200,11 @@
        type: "datetime",
        width: 160,
        align: "left",
        hidden: true,
      },
      {
        field: "creater",
        title: "创建人",
        title: "完成者",
        type: "string",
        width: 90,
        align: "left",
@@ -213,6 +215,7 @@
        type: "string",
        width: 90,
        align: "left",
        hidden: true,
      },
      {
        field: "remark",

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json

@@ -12,7 +12,7 @@
  "MainDB": "DB_WIDESEA", //当前项目的主库，所对应的连接字符串的Enabled必须为true
  //连接字符串
  //"ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=WIDESEA_WCSDBB2F;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCSDB_BB3F;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
    "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WCSDB_BBMain;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //跨域
  "Cors": {
    "PolicyName": "CorsIpAccess", //策略名称

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs

@@ -220,10 +220,12 @@
                    ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
                    //conveyorLine.SendCommand(taskCommand, childDeviceCode);

                    SendCommand(taskCommand, conveyorLine, childDeviceCode);

                    bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
                    if (sendFlag)
                    {
                    conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
                    _taskService.UpdateTaskStatusToNext(task);
                    }
                }
            }
            catch (Exception ex)
@@ -255,10 +257,12 @@
                    ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(newTask);
                    //conveyorLine.SendCommand(taskCommand, childDeviceCode);

                    SendCommand(taskCommand, conveyorLine, childDeviceCode);

                    bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
                    if (sendFlag)
                    {
                    conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
                    _taskService.UpdateData(newTask);
                    }
                }
            }
        }
@@ -301,14 +305,16 @@
                ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
                //conveyorLine.SendCommand(taskCommand, childDeviceCode);

                SendCommand(taskCommand, conveyorLine, childDeviceCode);

                bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
                if (sendFlag)
                {
                conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);

                _taskService.UpdateTaskStatusToNext(task);
                if (task.TaskType == (int)TaskOutboundTypeEnum.OutTray)
                {
                    _taskService.UpdateTaskStatusToNext(task);
                    }
                }
            }
        }
@@ -358,10 +364,12 @@
                        ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(newTask);
                        //conveyorLine.SendCommand(taskCommand, childDeviceCode);

                        SendCommand(taskCommand, conveyorLine, childDeviceCode);

                        bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
                        if (sendFlag)
                        {
                        conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
                        _taskService.UpdateData(newTask);
                        }
                    }
                }
                else
@@ -370,10 +378,12 @@
                    taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(stationManager.stationNGChildCode);
                    //conveyorLine.SendCommand(taskCommand, childDeviceCode);

                    SendCommand(taskCommand, conveyorLine, childDeviceCode);

                    bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
                    if (sendFlag)
                    {
                    conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
                    _taskService.UpdateTaskStatusToNext(task);
                    }
                }
            }
        }
@@ -421,9 +431,12 @@
                }

                //conveyorLine.SendCommand(taskCommand, childDeviceCode);
                SendCommand(taskCommand, conveyorLine, childDeviceCode);
                bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
                if (sendFlag)
                {
                conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
                content = _taskService.UpdateTaskStatusToNext(task);
                }
            }
            else
            {
@@ -455,11 +468,15 @@
                    }

                    //conveyorLine.SendCommand(taskCommand, childDeviceCode); 
                    SendCommand(taskCommand, conveyorLine, childDeviceCode);

                    bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
                    if (sendFlag)
                    {
                    conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);

                    taskNext.ExceptionMessage = log;
                    content = _taskService.UpdateTaskStatusToNext(taskNext);
                    }
                }
            }
        }
@@ -543,15 +560,41 @@
            return content;
        }

        public void SendCommand(ConveyorLineTaskCommand_After taskCommand, CommonConveyorLine_GW conveyorLine, string childDeviceCode)
        public bool SendCommand(ConveyorLineTaskCommand_After taskCommand, CommonConveyorLine_GW conveyorLine, string childDeviceCode)
        {
            conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, taskCommand.ConveyorLineTargetAddress, childDeviceCode);
            conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, Convert.ToInt16(taskCommand.ConveyorLineTargetAddress), childDeviceCode);
            Thread.Sleep(100);
            conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineBarcode, taskCommand.ConveyorLineBarcode, childDeviceCode); 
            Thread.Sleep(100);
            conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTaskNum, taskCommand.ConveyorLineTaskNum, childDeviceCode);
            for (int i = 0; i < 6; i++)
            {
                ConveyorLineTaskCommand_After command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand_After>(childDeviceCode);
                if (command != null)
                {
                    if (command.ConveyorLineBarcode == taskCommand.ConveyorLineBarcode && command.ConveyorLineTaskNum == taskCommand.ConveyorLineTaskNum && command.ConveyorLineTargetAddress == taskCommand.ConveyorLineTargetAddress)
                    {
                        return true;
        }
                    if (command.ConveyorLineTargetAddress != taskCommand.ConveyorLineTargetAddress)
                    {
                        conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, Convert.ToInt16(taskCommand.ConveyorLineTargetAddress), childDeviceCode);
                        Thread.Sleep(100);
    }
                    if (command.ConveyorLineBarcode != taskCommand.ConveyorLineBarcode)
                    {
                        conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineBarcode, taskCommand.ConveyorLineBarcode, childDeviceCode);
                        Thread.Sleep(100);
                    }
                    if (command.ConveyorLineTaskNum != taskCommand.ConveyorLineTaskNum)
                    {
                        conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTaskNum, taskCommand.ConveyorLineTaskNum, childDeviceCode); Thread.Sleep(100);
}

                }
            }
            return false;
        }
    }
}
#endregion

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs

@@ -269,9 +269,11 @@
                        var taskCommand = MapTaskCommand(task, command);

                        //conveyorLine.SendCommand(taskCommand, childDeviceCode);
                        SendCommand(taskCommand, conveyorLine, childDeviceCode);

                        bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
                        if (sendFlag)
                        {
                        _taskService.UpdateTaskStatusToNext(task);
                        }
                    }
                }
                //}
@@ -329,11 +331,13 @@
                    ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
                    //conveyorLine.SendCommand(taskCommand, childDeviceCode);

                    SendCommand(taskCommand, conveyorLine, childDeviceCode);

                    bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
                    if (sendFlag)
                    {
                    conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);

                    _taskService.UpdateTaskStatusToNext(task);
                    }
                }
            }
            else
@@ -398,8 +402,8 @@
            if (conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode).ObjToInt() == 0) //托盘正反信号
            {

            };

            }
            ;
            conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode);  //托盘有无电芯信号
        }


 Code Management/WMS/WIDESEA_WMSClient/src/api/http.js

@@ -15,11 +15,11 @@
  // axios.defaults.baseURL = 'http://192.168.20.253:5000/';
}
else if (process.env.NODE_ENV == 'debug') {
  axios.defaults.baseURL = 'http://192.168.20.253:5000/';
  axios.defaults.baseURL = 'http://192.168.15.253:5000/';
}
else if (process.env.NODE_ENV == 'production') {
  // axios.defaults.baseURL = 'http://127.0.0.1:5000/';
  axios.defaults.baseURL = 'http://192.168.20.253:5000/';
  axios.defaults.baseURL = 'http://192.168.15.253:5000/';
}

//axios.defaults.baseURL = 'http://api.volcore.xyz/';

 Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js

@@ -29,6 +29,14 @@
    }
  },
  {
    path: '/Dt_LocationStatus',
    name: 'Dt_LocationStatus',
    component: () => import('@/views/widesea_wms/basicinfo/LocationStatusChange.vue'),
    meta: {
       
    }
  },
  {
    path: '/Dt_InboundOrderDetail',
    name: 'Dt_InboundOrderDetail',
    component: () => import('@/views/widesea_wms/invoices/Dt_InboundOrderDetail.vue'),

 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationStatus.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,85 @@
<!--
*Author：jxx
 *Contact：283591387@qq.com
 *代码由框架生成,任何更改都可能导致被代码生成器覆盖
 *业务请在@/extension/widesea_wms/basicinfo/Dt_LocationInfo.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/basicinfo/Dt_LocationInfo.jsx";
import { ref, defineComponent } from "vue";
export default defineComponent({
    setup() {
        const table = ref({
            key: 'id',
            footer: "Foots",
            cnName: '货位信息',
            name: '/api',
            url: "/Task/LocationStatus",
            sortName: "id"
        });
        const editFormFields = ref({ "locationStatus": "" });
        const editFormOptions = ref([
            [
                { "title": "货位状态", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] }, 
                { "title": "是否禁用", "field": "enalbeStatus", "type": "select", dataKey: "EnalbeStatus", data: [] }, 
            ]
        ]);
        const searchFormFields = ref({ "LocationID": "",roadWayNO:"" });
        const searchFormOptions = ref([
            [
                { "title": "货位编号", "field": "locationCode", type: "text" },
                { "title": "货位状态", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
                { "title": "巷道编号", "field": "roadWayNO", type: "text" },
            ],
            [
                { "title": "行", "field": "row", type: "text" },
                { "title": "列", "field": "column", "type": "text" },
                { "title": "层", "field": "layer", type: "text" },
            ]
        ]);
        const columns = ref([{ field: 'locationID', title: '货位ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
        { field: 'locationCode', title: '货位编号', type: 'string', width: 110, require: true, align: 'left' },
        { field: 'locationName', title: '货位名称', type: 'string', width: 120, align: 'left' },
        { field: 'roadwayNo', title: '巷道号', type: 'string', width: 110, require: true, align: 'left', sort: true },
        { field: 'row', title: '行', type: 'string', width: 70, align: 'left' },
        { field: 'column', title: '列', type: 'string', width: 70, align: 'left' },
        { field: 'layer', title: '层', type: 'string', width: 110, align: 'left' },
        { field: 'depth', title: '深度', type: 'string', width: 110, align: 'left', hidden: true  },
        { field: 'scNo', title: '对应堆垛机号', type: 'string', width: 110, align: 'left', hidden: true },
        { field: 'locationType', title: '货位类型', type: 'int', width: 110, align: 'left',bind: { key: "LocationType", data: [] } },
        { field: 'locationStatus', title: '货位状态', type: 'int', width: 110, align: 'left', bind: { key: "LocationState", data: [] } },
        { field: 'enalbeStatus', title: '是否禁用', type: 'int', width: 75, align: 'left', bind: { key: "EnalbeStatus", data: [] }}, 
        // { field: 'isLocked', title: '是否锁定', type: 'bool', width: 110, align: 'left', bind: { key: "IsLocked", data: [] } },
        { field: 'locationDesc', title: '货位描述', type: 'string', width: 110, align: 'left', hidden: true },
        { field: 'remark', title: '检测柜允许', type: 'string', width: 110, align: 'left' ,bind: { key: "AllowStatus", data: [] }},
        { field: 'creater', title: '创建人', type: 'string', sort: true, width: 110, align: 'left' },
        { field: 'createDate', title: '创建时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
        { field: 'modifier', title: '修改人', type: 'string', sort: true, width: 100, align: 'left' },
        { field: 'modifyDate', title: '修改时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
    ]);
        const detail = ref({
            cnName: "#detailCnName",
            table: "#detailTable",
            columns: [],
            sortName: "",
            key: ""
        });
        return {
            table,
            extend,
            editFormFields,
            editFormOptions,
            searchFormFields,
            searchFormOptions,
            columns,
            detail,
        };
    },
});
</script>

 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue

@@ -83,9 +83,9 @@
        { field: 'dispatchertime', title: '任务下发时间', type: 'datetime', width: 150, align: 'left', sort: true },
        { field: 'operateType', title: '操作类型', type: 'string', width: 110, align: 'left', bind: { key: "operateType", data: [] }},
        { field: 'remark', title: '备注', type: 'string', width: 110, align: 'left',hidden: true, },
        { field: 'createDate', title: '创建时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
        { field: 'createDate', title: '创建时间', type: 'datetime', sort: true, width: 150, hidden: true,align: 'left', sort: true },
        //{ field: 'modifyDate', title: '修改时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
        { field: 'creater', title: '创建人', type: 'string', sort: true, width: 110, align: 'left' },
        { field: 'creater', title: '完成者', type: 'string', sort: true, width: 110, align: 'left' },
        //{ field: 'modifier', title: '修改人', type: 'string', sort: true, width: 100, align: 'left' },
        { field: 'finishTime', title: '完成时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
        { field: 'locationCode', title: '货位号', type: 'string', width: 110, hidden: true, align: 'left' },

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs

@@ -271,4 +271,9 @@
    /// </summary>
    /// <returns></returns>
    WebResponseContent Getproductionstatistics();
    /// <summary>
    /// èŽ·å–货位状态不是空闲、有货的全部货位
    /// </summary>
    /// <returns></returns>
    WebResponseContent GetLocationStatus();
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs

@@ -1637,6 +1637,20 @@
            return content.Error(ex.Message);
        }
    }
    public WebResponseContent GetLocationStatus()
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            List<DtLocationInfo> LocationList = _locationRepository.Db.Queryable<DtLocationInfo>().Where(x => x.LocationStatus != 2 && x.LocationStatus != 0).ToList();
            return content.OK1(total1: LocationList.Count, data: LocationList);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }

    }
}

internal class TaskHourData

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs

@@ -261,4 +261,13 @@
    {
        return Service.Getproductionstatistics();
    }
    /// <summary>
    /// èŽ·å–不是空闲以及有货的全部货位
    /// </summary>
    /// <returns></returns>
    [HttpPost, AllowAnonymous, Route("LocationStatusgetPageData")]
    public WebResponseContent LocationStatus()
    {
        return Service.GetLocationStatus();
    }
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile1.pubxml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
  <PropertyGroup>
    <DeleteExistingFiles>false</DeleteExistingFiles>
    <ExcludeApp_Data>false</ExcludeApp_Data>
    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\2025å¹´7月4日</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <_TargetId>Folder</_TargetId>
  </PropertyGroup>
</Project>

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile1.pubxml.user

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>D:\2025å¹´7月4日</_PublishTargetUrl>
    <History>True|2025-07-04T02:32:33.2226066Z||;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>