托盘数量可修改

dengjunjie

2024-05-27 ceb82ce60d984e2a9457502e74ec12b6800d26ef

托盘数量可修改

 ´úÂë¹ÜÀí/PCS/WCS_Client/src/api/http.js

@@ -12,7 +12,7 @@
let loadingInstance;
let loadingStatus = false;
if (process.env.NODE_ENV == 'development') {
    axios.defaults.baseURL = 'http://127.0.0.1:8099/';
    axios.defaults.baseURL = 'http://192.168.12.101:8099/';
}
else if (process.env.NODE_ENV == 'debug') {
    axios.defaults.baseURL = 'http://192.168.12.101:8099/';

 ´úÂë¹ÜÀí/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo.vue

@@ -27,7 +27,7 @@
                cnName: '工单信息',
                name: 'tomes/VV_Workinfo',
                url: "/VV_Workinfo/",
                sortName: "workOrder"
                sortName: "CreateTime"
            });
            const editFormFields = ref({"stackNoRange":""});
            const editFormOptions = ref([[{"title":"打包数量","field":"stackNoRange","type":"number"}]]);

 ´úÂë¹ÜÀí/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo_hty.vue

@@ -27,12 +27,12 @@
                cnName: '工单历史信息',
                name: 'tomes/VV_Workinfo_hty',
                url: "/VV_Workinfo_hty/",
                sortName: "FinishTime"
                sortName: "completedate"
            });
            const editFormFields = ref({});
            const editFormOptions = ref([]);
            const searchFormFields = ref({"workOrder":"","jobID":"","drawingNo":"","productName":"","heatID":"","billetID":"","SN":"","processCode":"","CreateTime":"","FinishTime":"","operatetype":"","productDesc":""});
            const searchFormOptions = ref([[{"title":"图号","field":"drawingNo","type":"like"},{"title":"工作令号","field":"workOrder","type":"like"},{"title":"工单编号","field":"jobID","type":"like"}],[{"title":"产品名称","field":"productName","type":"like"},{"title":"炉代号","field":"heatID","type":"like"},{"title":"钢坯号","field":"billetID","type":"like"}],[{"title":"车轮SN号","field":"SN","type":"like"},{"dataKey":"WorkTypes","data":[],"title":"工单类型","field":"processCode","type":"select"},{"dataKey":"WorkOperateTypes","data":[],"title":"操作类型","field":"operatetype","type":"select"}],[{"title":"创建时间","field":"CreateTime","type":"date"},{"title":"完成时间","field":"FinishTime","type":"date"},{"title":"产品描述","field":"productDesc","type":"like"}]]);
            const searchFormOptions = ref([[{"title":"图号","field":"drawingNo","type":"like"},{"title":"工作令号","field":"workOrder","type":"like"},{"title":"工单编号","field":"jobID","type":"like"}],[{"title":"产品名称","field":"productName","type":"like"},{"title":"炉代号","field":"heatID","type":"like"},{"title":"钢坯号","field":"billetID","type":"like"}],[{"title":"车轮SN号","field":"SN","type":"like"},{"dataKey":"WorkTypes","data":[],"title":"工单类型","field":"processCode","type":"select"},{"dataKey":"WorkOperateTypes","data":[],"title":"操作类型","field":"operatetype","type":"select"}],[{"title":"创建时间","field":"CreateTime","type":"date"},{"title":"操作时间","field":"completedate","type":"date"},{"title":"产品描述","field":"productDesc","type":"like"}]]);
            const columns = ref([{field:'mes_id',title:'工单头表ID',hidden:true,type:'guid',width:110,require:true,align:'left',sort:true},
                       {field:'workOrder',title:'工作令号',type:'string',sort:true,width:110,align:'left'},
                       {field:'jobID',title:'工单编号',type:'string',sort:true,width:110,align:'left'},
@@ -60,6 +60,7 @@
                       {field:'heatBatchID',title:'热处理批次',hidden:true,type:'string',width:110,align:'left'},
                       {field:'Status',title:'工单状态',type:'string',width:110,align:'left'},
                       {field:'FinishTime',title:'完成时间',type:'datetime',width:150,align:'left',sort:true},
                       {field:'completedate',title:'操作时间',type:'datetime',width:150,align:'left',sort:true},
                       {field:'operatetype',title:'操作类型',type:'string',bind:{ key:'WorkOperateTypes',data:[]},width:110,align:'left'},
                       {field:'compeletor',title:'操作者',type:'string',width:110,align:'left'},
                       {field:'productDesc',title:'产品描述',type:'string',width:180,align:'left'}]);

 ´úÂë¹ÜÀí/PCS/WCS_Client/src/views/widesea_wcs/tomes/dt_mes_head.vue

@@ -27,13 +27,14 @@
                cnName: '工单头表',
                name: 'tomes/dt_mes_head',
                url: "/dt_mes_head/",
                sortName: "ID"
                sortName: "CreateTime"
            });
            const editFormFields = ref({"skip_op_1":"","skip_op_2":"","skip_op_3":""});
            const editFormFields = ref({"stackNoRange":"","skip_op_1":"","skip_op_2":"","skip_op_3":""});
            const editFormOptions = ref([
            [{ "dataKey": "skip_op_Status", "data": [], "title": "视觉检测1", "required": true, "field": "skip_op_1", "type": "radio" }],
            [{ "dataKey": "skip_op_Status", "data": [], "title": "视觉检测2", "required": true, "field": "skip_op_2", "type": "radio" }],
            [{ "dataKey": "skip_op_Status", "data": [], "title": "喷防锈液", "required": true, "field": "skip_op_3", "type": "radio" }],
                [{"title":"打包数量","field":"stackNoRange","type":"number"}],
            [{ "dataKey": "skip_op_Status", "data": [], "title": "视觉检测1", "required": true, "field": "skip_op_1", "type": "select" }],
            [{ "dataKey": "skip_op_Status", "data": [], "title": "视觉检测2", "required": true, "field": "skip_op_2", "type": "select" }],
            [{ "dataKey": "skip_op_Status", "data": [], "title": "喷防锈液", "required": true, "field": "skip_op_3", "type": "select" }],
        //     [{
        //   title: "指定库区", field: "area",
        //   data: [
@@ -54,22 +55,22 @@
            const columns = ref([{field:'mes_id',title:'mes_id',type:'guid',width:110,hidden:true,readonly:true,require:true,align:'left'},
                       {field:'workOrder',title:'工作令号',type:'string',width:110,align:'left',sort:true},
                       {field:'jobID',title:'工单编号',type:'string',width:110,align:'left'},
                       {field:'reqID',title:'需求单号',type:'string',width:110,align:'left'},
                       {field:'reqIDLineNo',title:'需求单号行号',type:'string',width:110,align:'left'},
                       {field:'materialCode',title:'物料编码',type:'string',width:110,align:'left'},
                    //    {field:'reqID',title:'需求单号',type:'string',width:110,align:'left'},
                    //    {field:'reqIDLineNo',title:'需求单号行号',type:'string',width:110,align:'left'},
                    //    {field:'materialCode',title:'物料编码',type:'string',width:110,align:'left'},
                       {field:'drawingNo',title:'图号',type:'string',width:110,align:'left'},
                       {field:'drawingNoVer',title:'技术状态',type:'string',width:110,align:'left'},
                       {field:'productName',title:'产品名称',type:'string',width:110,align:'left'},
                    //    {field:'productName',title:'产品名称',type:'string',width:110,align:'left'},
                       {field:'processCode',title:'工单类型',bind: { key: 'WorkTypes' },type:'string',width:110,align:'left'},
                       {field:'quantity',title:'计划数量',type:'int',width:110,align:'left'},
                       {field:'finishNum',title:'完成数量',type:'int',width:110,align:'left'},
                       {field:'area',title:'指定库区',type:'string',width:110,align:'left'},
                    //    {field:'typeID',title:'轮型代码',type:'string',width:110,align:'left'},
                       {field:'stackNoRange',title:'打包数量',type:'int',width:110,align:'left',sort:true},
                       {field:'skip_op_1',title:'视觉检测1',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,require:true,align:'left'},
                       {field:'skip_op_2',title:'视觉检测2',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,require:true,align:'left'},
                       {field:'skip_op_3',title:'喷防锈液',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,require:true,align:'left'},
                       {field:'area',title:'指定库区',type:'string',width:110,align:'left'},
                       {field:'typeID',title:'轮型代码',type:'string',width:110,align:'left'},
                       {field:'stackNoRange',title:'打包数量',type:'int',width:110,align:'left'},
                       {field:'maxDiameterDiff',title:'轮径偏差',type:'decimal',width:110,align:'left'},
                    //    {field:'maxDiameterDiff',title:'轮径偏差',type:'decimal',width:110,align:'left'},
                       {field:'expectedStartTime',title:'计划开始时间',type:'datetime',width:150,align:'left',sort:true},
                       {field:'expectedFinishTime',title:'计划完成时间',type:'datetime',width:150,align:'left',sort:true},
                       {field:'CreateTime',title:'创建时间',type:'datetime',width:150,align:'left',sort:true},

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/VV_Mes_Workinfo.cs

@@ -149,7 +149,7 @@
        public string typeID { get; set; }

        /// <summary>
        ///
        ///打包数量
        /// </summary>
        [Key]
        [Display(Name = "stackNoRange")]

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/VV_Workinfo_hty.cs

@@ -276,6 +276,12 @@
        [Editable(true)]
        public string productDesc { get; set; }


        /// <summary>
        ///操作时间
        /// </summary>
        [Display(Name = "操作时间")]
        [Column(TypeName = "datetime")]
        [Editable(true)]
        public DateTime? completedate { get; set; }
    }
}

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs

@@ -496,7 +496,8 @@
                            var station = stationinfoRepository.Find(x => x.area == areaCode && x.stationCode.Substring(x.stationCode.Length - 1, 1) == AreaNr.ToString()).FirstOrDefault();
                            if (station != null)
                            {
                                if (station.quantity >= 5)
                                if (station.quantity >= Mes_Work.stackNoRange)
                                    //if (station.quantity >= 5)
                                {
                                    Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//报警
                                    WriteLog.Write_Log(name + "放料完成出错", Wheel_SN, "车轮数量已满！", $"区域号：{AreaNr}；\n车轮数：{station.quantity}\n错误信息：区域号车轮数量已满！");
@@ -657,7 +658,8 @@
                           .Where(x => x.enable
                           && x.stationCode != NGStation
                           && x.location_state == LocationStateEnum.Stroge.ToString()
                           && x.quantity < 5
                           && x.quantity < Work.stackNoRange
                           //&& x.quantity < 5
                           && x.stationType == Work.drawingNo
                           && x.Number == Work.workOrder
                           && x.heatNumber == Work.heatID)
@@ -670,7 +672,8 @@
                           .Where(x => x.enable
                           && x.stationCode != NGStation
                           && x.location_state == LocationStateEnum.Stroge.ToString()
                           && x.quantity < 5
                           && x.quantity < Work.stackNoRange
                           //&& x.quantity < 5
                           && x.stationType == Work.drawingNo
                           && x.Number == Work.workOrder)
                           .OrderByDescending(x => x.quantity)
@@ -699,7 +702,8 @@
                                #endregion

                                #region æ‰˜ç›˜è½¦è½®å †åž›ç¬¬å››ä¸ªæ—¶ä¸‹å‘另外一个炉号的入库任务
                                if (Stationinfo.quantity + 1 >= 4)
                                //if (Stationinfo.quantity + 1 >= 4)
                                if (Stationinfo.quantity + 1 >= Work.stackNoRange - 1)
                                {
                                    var stationinfo = Stations.Where(x => x.enable && x.stationCode != NGStation && x.stationCode != Stationinfo.stationCode && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).FirstOrDefault();
                                    if (stationinfo != null)
@@ -798,7 +802,8 @@
                            dt_stationinfo Stationinfo = Stations.Where(x => x.enable
                            && x.stationCode == NGStation
                            && x.location_state == LocationStateEnum.Stroge.ToString()
                            && x.quantity < 5
                            && x.quantity < Work.stackNoRange
                            //&& x.quantity < 5
                            && x.stationType == Work.drawingNo).FirstOrDefault();

                            if (Stationinfo == null)
@@ -912,70 +917,6 @@
                tasktype = "TaskType_OutsourceInbound";
            AGVTask.AddQueueTask(stationinfoRepository, agvtaskRepository, stationinfo, tasktype, Work);
        }

        #region MyRegion
        /// <summary>
        /// AGV任务
        /// </summary>
        //public void agvtask(Idt_stationinfoRepository stationinfoRepository, dt_stationinfo stationinfo, VV_Mes_Workinfo Work, string tasktype)
        //{
        //    VOLContext Context = new VOLContext();
        //    Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context);
        //    Idt_mes_headRepository mes_HeadRepository = new dt_mes_headRepository(Context);

        //    var task = agvtaskRepository.Find(x => x.agv_fromaddress == stationinfo.stationCode).FirstOrDefault();
        //    if (task != null) return;
        //    //var mes_Head = mes_HeadRepository.Find(x => x.jobID == Work.jobID).FirstOrDefault();
        //    //if (mes_Head == null)
        //    //{
        //    //    stationinfo.remark = "触发入库任务,但未找到工单头表！";
        //    //    stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
        //    //    stationinfoRepository.Update(stationinfo, true);
        //    //    return;
        //    //}

        //    dt_stationinfo TargetLocation = null;
        //    //int CompeletedNum = Convert.ToInt32(mes_Head.quantity) - Convert.ToInt32(mes_Head.finishNum);
        //    //if (mes_Head.quantity <= 50) tasktype = "TaskType_OutsourceInbound";

        //    if (tasktype == "TaskType_OutsourceInbound" || !string.IsNullOrEmpty(Work.area))
        //        TargetLocation = StationTask.GetEmptyLocation(stationinfoRepository);
        //    else if (tasktype == "TaskType_Inbound")
        //        TargetLocation = GetLocation.GetEmptyLocation(stationinfoRepository, Work, stationinfo);
        //    //TargetLocation = GetLocation.GetEmptyLocation(stationinfoRepository, mes_Head, stationinfo);
        //    if (TargetLocation != null)
        //    {
        //        dt_agvtask agvtask = new dt_agvtask()
        //        {
        //            agv_fromaddress = stationinfo.stationCode,
        //            agv_id = Guid.NewGuid(),
        //            agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
        //            agv_grade = 1,
        //            agv_createtime = DateTime.Now,
        //            agv_taskstate = "Create",
        //            agv_materielid = stationinfo.stationType,
        //            agv_qty = stationinfo.quantity,
        //            agv_tasktype = tasktype,
        //            agv_toaddress = TargetLocation.stationCode,
        //            agv_userid = "系统",
        //            bindSN = stationinfo.bindSN,
        //            agv_worktype = Convert.ToInt32(Work.processCode),
        //            agv_materbarcode = Work.materialCode,
        //            agv_Traytype = stationinfo.tray_type,
        //            jobID = stationinfo.Number,
        //            agv_TrayStatus = stationinfo.tray_status
        //        };
        //        agvtaskRepository.Add(agvtask, true);
        //        stationinfo.location_state = LocationStateEnum.InBusy.ToString();
        //        stationinfoRepository.Update(stationinfo, true);
        //        TargetLocation.location_state = LocationStateEnum.InBusy.ToString();
        //        TargetLocation.stationType = agvtask.agv_materielid;
        //        TargetLocation.heatNumber = stationinfo.heatNumber;
        //        TargetLocation.Number = agvtask.jobID;
        //        stationinfoRepository.Update(TargetLocation, true);
        //    }
        //}
        #endregion

    }
}

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs

@@ -66,7 +66,8 @@
                    dt_stationinfo TargetLocation = null;
                    string tasktype = "";

                    if (item.quantity == 5)
                    //if (item.quantity == 5)
                    if (item.quantity == work.stackNoRange)
                    {
                        if (!string.IsNullOrEmpty(work.area) || item.stationCode.Contains("3"))
                            tasktype = "TaskType_OutsourceInbound";
@@ -74,58 +75,6 @@
                            tasktype = "TaskType_Inbound";

                        AGVTask.AddQueueTask(stationinfoRepository, agvtaskRepository, item, tasktype, work);

                        #region MyRegion
                        //if (/*(mesinfo.quantity <= 50 &&*/ !string.IsNullOrEmpty(work.area) || item.stationCode.Contains("3"))
                        //{
                        //    //todo å¯»æ‰¾å¯æ”¾è´§å¤–协放货台
                        //    tasktype = "TaskType_OutsourceInbound";
                        //    TargetLocation = GetEmptyLocation(stationinfoRepository);

                        //}
                        //else
                        //{
                        //    //todo:  è°ƒç”¨WMS接口创建任务
                        //    tasktype = "TaskType_Inbound";
                        //    TargetLocation = GetLocation.GetEmptyLocation(stationinfoRepository, work, item);
                        //}
                        //if (TargetLocation != null)
                        //{
                        //    dt_agvtask agvtask = new dt_agvtask()
                        //    {
                        //        agv_fromaddress = item.stationCode,
                        //        agv_id = Guid.NewGuid(),
                        //        agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
                        //        agv_grade = 1,
                        //        agv_createtime = DateTime.Now,
                        //        agv_taskstate = "Create",
                        //        agv_materielid = item.stationType,
                        //        agv_qty = item.quantity,
                        //        agv_tasktype = tasktype,
                        //        agv_toaddress = TargetLocation.stationCode,
                        //        agv_userid = "系统",
                        //        bindSN = item.bindSN,
                        //        agv_worktype = Convert.ToInt32(work.processCode),
                        //        agv_materbarcode = work.materialCode,
                        //        agv_Traytype = item.tray_type,
                        //        jobID = item.Number,
                        //        agv_TrayStatus = item.tray_status
                        //    };
                        //    agvtaskRepository.Add(agvtask, true);

                        //    item.location_state = LocationStateEnum.InBusy.ToString();
                        //    stationinfoRepository.Update(item, true);

                        //    TargetLocation.location_state = LocationStateEnum.InBusy.ToString();
                        //    TargetLocation.stationType = agvtask.agv_materielid;
                        //    TargetLocation.heatNumber = item.heatNumber;
                        //    TargetLocation.billetID = item.billetID;
                        //    TargetLocation.Number = agvtask.jobID;
                        //    stationinfoRepository.Update(TargetLocation, true);
                        //    WriteDBLog.Success("创建入库任务", $"任务编号：{agvtask.agv_tasknum}", "PCS");
                        //}
                        #endregion

                    }
                }
            }

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/ToMES/ToMesServer.cs

@@ -87,7 +87,8 @@
                    quantity = workInfo.quantity,
                    reqID = workInfo.reqID,
                    reqIDLineNo = workInfo.reqIDLineNo,
                    stackNoRange = workInfo.stackNoRange,
                    stackNoRange = 5,
                    //stackNoRange = workInfo.stackNoRange,
                    typeID = workInfo.typeID,
                    workOrder = workInfo.workOrder,
                    processCode = workInfo.processCode,