添加入库触发条件,修改上料区任务逻辑

dengjunjie

2024-04-20 d2cef0150abe6d14cbfa60c8845795b91a1f5f97

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

@@ -54,7 +54,7 @@

                    //根据下料口的绑定信息查询对应工单，检测此工单是否已完成  å®Œæˆå³å¯å°†å…¶é€å…¥åº“

                    var work = workinfoRepository.Find(x => x.workOrder == item.Number && x.drawingNo == x.drawingNo && x.heatID == item.heatNumber).FirstOrDefault();
                    var work = workinfoRepository.Find(x => x.workOrder == item.Number && x.drawingNo == x.drawingNo && x.heatID == item.heatNumber && x.processCode == "17").FirstOrDefault();
                    if (work == null)
                    {
                        item.remark = "触发入库任务,但未找到工单信息！";
@@ -63,29 +63,13 @@
                        continue;
                    }

                    //dt_mes_head mesinfo = mes_HeadRepository.Find(x => x.workOrder == item.Number).FirstOrDefault();
                    //if (mesinfo == null)
                    //{
                    //    item.remark = "触发入库任务,但未找到工单头表！";
                    //    item.location_state = LocationStateEnum.Abnormal.ToString();
                    //    stationinfoRepository.Update(item, true);
                    //    continue;
                    //    //throw new Exception("未找到工单头表！工单号：" + item.Number);
                    //}
                    //var dt_Geometry_Data = PipelineJob.QueryMateriel(mesinfo.drawingNo);
                    //var dt_Geometry_Data1 = PipelineJob.QueryMateriel1(mesinfo.drawingNo);

                    //int CompeletedNum = Convert.ToInt32(mesinfo.quantity) - Convert.ToInt32(mesinfo.finishNum);



                    dt_stationinfo TargetLocation = null;
                    string tasktype = "";
                    if (item.quantity == 5 /*|| CompeletedNum == 0*/)  //循环读取车轮数为5或者订单已完成数量的下料口    â†’工单人工关闭的工单
                    if (item.quantity == 5 /*|| CompeletedNum == 0*/)
                    {


                        if (/*(mesinfo.quantity <= 50 &&*/ !string.IsNullOrEmpty(work.area) || item.stationCode.Contains("3"))    //小于50件直接出库
                        if (/*(mesinfo.quantity <= 50 &&*/ !string.IsNullOrEmpty(work.area) || item.stationCode.Contains("3"))
                        {
                            //todo å¯»æ‰¾å¯æ”¾è´§å¤–协放货台
                            tasktype = "TaskType_OutsourceInbound";
@@ -97,7 +81,6 @@
                            //todo:  è°ƒç”¨WMS接口创建任务
                            tasktype = "TaskType_Inbound";
                            TargetLocation = GetLocation.GetEmptyLocation(stationinfoRepository, work, item);
                            //TargetLocation = GetEmptyLocation(stationinfoRepository, mesinfo, item, CompeletedNum, dt_Geometry_Data == null ? dt_Geometry_Data1.e : dt_Geometry_Data.e);
                        }
                        if (TargetLocation != null)
                        {