add

zongzhibin

2024-11-27 72656483d7be602216dab6dadc9ea7783c155c1c

add

 CC/iWareCC_ASRS/ThreadService/03_BZ12(»úÆ÷ÈËÂë°ü¹¤Î»)/DataProcess_BZ12.cs

@@ -83,14 +83,15 @@
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},根据UPI:{upiCode}没有找到对象 ";
                                    continue;
                                }
                                isrotate = 2;
                                isrotate = short.Parse(upiObj.Info17);
                                placeX = (short)upiObj.MachineXCenter;
                                placeY = (short)upiObj.MachineYCenter;
                                placeZ = (short)upiObj.MachineZCenter;
                                if (upiObj.UpiStatus == 3)
                                if (upiObj.UpiStatus == 3||upiObj.UpiStatus==5)
                                {
                                    continue;
                                }
                                upiObj.UpiStatus = 5;
                                //查处这包所有的数量
                                var upiList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
                                //查询是否末板并且判断有没有混批
@@ -141,7 +142,7 @@

                                }
                                //查询有没有次序小于当前次序并且没有码垛的
                                var oldupi = upiList.Where(x => x.Shelf < upiObj.Shelf && x.UpiStatus != (int)UpiStatusEnum.已码垛).FirstOrDefault();
                                var oldupi = upiList.Where(x => x.Shelf < upiObj.Shelf && (x.UpiStatus != (int)UpiStatusEnum.已码垛 && x.UpiStatus != (int)UpiStatusEnum.码垛中)).FirstOrDefault();
                                if (oldupi != null)
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}码包顺序错误 ";

 CC/iWareCC_ASRS/ThreadService/03_BZ12(»úÆ÷ÈËÂë°ü¹¤Î»)/DataProcess_BZ12_FinishTask.cs

@@ -75,7 +75,7 @@
                                var upiobj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == task.UPI).FirstOrDefault();
                                if (upiobj != null)
                                {
                                    upiobj.UpiStatus = 3;
                                    upiobj.UpiStatus =  (int)UpiStatusEnum.已码垛;
                                }
                                task.TaskStatus = (int)TaskStatusEnum.已完成;
                                task.TaskStatusName = TaskStatusEnum.已完成.ToString();