1

schangxiang@126.com

2024-12-02 607fa9a9dec5ff4fe780231d635bbd62e1740f37

1

 CC/iWareCC_ASRS/Handler/WmsRecordUpiProcessHandler.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
using iWareCommon.Utils;
using iWareSql.WmsDBModel;
using System;

namespace iWareCC
{
    public class WmsRecordUpiProcessHandler
    {
        /// <summary>
        /// ä¿å­˜ æ¿ä»¶å±¥åŽ†è¡¨
        /// </summary>
        /// <param name="wmsDB"></param>
        /// <param name="orderUPI_New"></param>
        /// <param name="location"></param>
        public static void SaveWmsRecordUpiProcess(WmsDBModel wmsDB, mes_batchOrderUPI_new orderUPI_New, string location, string operRemark)
        {
            wms_record_upi_process upi_Process = ClassHelper.RotationMapping<wms_record_upi_process, mes_batchOrderUPI_new>(orderUPI_New);

            upi_Process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
            upi_Process.CreateTime = DateTime.Now;
            upi_Process.CreateUserName = "WCS";
            upi_Process.Location = location;
            upi_Process.OperRemark = operRemark;

            wmsDB.wms_record_upi_process.Add(upi_Process);

        }

        /// <summary>
        /// ä¿å­˜ æ¿ä»¶å±¥åŽ†è¡¨
        /// </summary>
        /// <param name="wmsDB"></param>
        /// <param name="orderUPI_New"></param>
        /// <param name="location"></param>
        public static void SaveWmsRecordPackageProcess(WmsDBModel wmsDB, mes_batchOrderUPI_new orderUPI_New, string location, string operRemark)
        {
            wms_record_package_process upi_Process = ClassHelper.RotationMapping<wms_record_package_process, mes_batchOrderUPI_new>(orderUPI_New);

            upi_Process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
            upi_Process.CreateTime = DateTime.Now;
            upi_Process.CreateUserName = "WCS";
            upi_Process.Location = location;
            upi_Process.OperRemark = operRemark;

            wmsDB.wms_record_package_process.Add(upi_Process);

        }

        /// <summary>
        /// ä¿å­˜ æ¿ä»¶å±¥åŽ†è¡¨
        /// </summary>
        /// <param name="wmsDB"></param>
        /// <param name="orderUPI_New"></param>
        /// <param name="location"></param>
        public static void SaveWmsRecordPackageProcess(WmsDBModel wmsDB, mes_package_gather package_Gather, string location, string operRemark)
        {
            wms_record_package_process upi_Process = ClassHelper.RotationMapping<wms_record_package_process, mes_package_gather>(package_Gather);

            upi_Process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
            upi_Process.CreateTime = DateTime.Now;
            upi_Process.CreateUserName = "WCS";
            upi_Process.Location = location;
            upi_Process.OperRemark = operRemark;

            wmsDB.wms_record_package_process.Add(upi_Process);

        }


    }
}

 CC/iWareCC_ASRS/ThreadService/00_269¹¤Î»/DataProcess_269.cs

@@ -59,11 +59,30 @@
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_269 = $"{rgvLocation.ToString()},根据UPI:{upiCode}没有找到对象 ";
                                    continue;
                                    //*/
                                }

                                //推送plc解析完成
                                using (StationServiceClient client = new StationServiceClient())
                                {
                                    var res = await client.WriteQiTaoInfoAsync((int)EDevice.Station, rgvLocation, true);
                                    if (!res.result)
                                    {
                                        SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()}- æŽ¨é€plc解析完成 å¤±è´¥,WriteQiTaoInfoAsync返回:{res.resMsg}";
                                        continue;
                                    }
                                    else
                                    {
                                        Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-推送plc解析完成 æˆåŠŸ,WriteQiTaoInfoAsync，参数: ç«™ç‚¹{rgvLocation}");
                                    }
                                }

                                upiObj.AreaCode = (int)AreaCodeEnum.待缓存分拣区;

                                WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "269", "首次扫码");

                                wmsDB.SaveChanges();
                                //*/
                            }
                        }
                    }

 CC/iWareCC_ASRS/ThreadService/01_BZ01¹¤Î»£¨Çå»Ò£¬Ï´°åºó¹¤Î»£©/DataProcess_BZ01.cs

@@ -37,7 +37,7 @@
                SystemWarningMsg._lbl_alert_DataProcess_BZ01 = string.Empty;
                try
                {
                    if ( SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_BZ01 &&
                    if (SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_BZ01 &&
                    {
                        if (FormCC.IsAllowRunOutMode == true)
                        {
@@ -131,6 +131,8 @@
                                rbRunMode.OrderId = upiObj.OrderId;
                                rbRunMode.PackageCode = upiObj.PackageCode;

                                WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ01", "齐包验证");

                                wmsDB.SaveChanges();
                            }
                        }

 CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Inbound/1¡¢DataProcess_BZ39.cs

@@ -34,7 +34,7 @@
                SystemWarningMsg._lbl_alert_DataProcess_BZ39 = string.Empty;
                try
                {
                    if ( SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_BZ39 &&
                    if (SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_BZ39 &&
                    {
                        var rgvLocation = StationLocationEnum.BZ39.ToString();
                        /*
@@ -57,7 +57,7 @@
                                //不再拦截 

                                //要是有已下发的任务，就不要执行
                                var isValidate = TaskHandler.ValidateIssueTaskForRobotBuffer(wmsDB,upiCode);
                                var isValidate = TaskHandler.ValidateIssueTaskForRobotBuffer(wmsDB, upiCode);
                                if (!isValidate)
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-有‘已下发’的任务，不能处理,此次循环结束";
@@ -131,6 +131,8 @@

                                place.PlaceStatus = (int)PlaceStatusEnum.锁定;

                                WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ39", "缓存入库");

                                wmsDB.SaveChanges();
                            }
                        }

 CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Inbound/2¡¢DataProcess_RobotBuffer_FinishTask.cs

@@ -134,6 +134,8 @@
                                    }
                                }

                                WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, task.PlaceCode, "缓存入库完成");

                                wmsDB.SaveChanges();
                            }
                        }

 CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Outbound/3¡¢DataProcess_RobotBuffer_FinishTaskForOutbound.cs

@@ -105,6 +105,8 @@
                                    }
                                }

                                WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, task.PlaceCode, "出缓存库："+task.TaskMsg);

                                wmsDB.SaveChanges();
                            }
                        }

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

@@ -36,21 +36,21 @@
                        var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
                        if (obj.R_PalletizingAck)
                        {
                                //给PLC推送任务完接收完成复位信号
                                using (StationServiceClient client = new StationServiceClient())
                            //给PLC推送任务完接收完成复位信号
                            using (StationServiceClient client = new StationServiceClient())
                            {
                                var res = client.WriteStation_ACK((int)EDevice.Station, false, rgvLocation);
                                if (!res.result)
                                {
                                    var res = client.WriteStation_ACK((int)EDevice.Station, false, rgvLocation);
                                    if (!res.result)
                                    {
                                        SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-下发码板任务 å¤±è´¥,SetPalletizingTaskFinishAck è¿”回:{res.resMsg}";
                                        continue;
                                    }
                                    else
                                    {
                                        Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-下发入库任务 æˆåŠŸ,SetPalletizingTaskFinishAck，参数: ç«™ç‚¹{rgvLocation}");
                                    }
                                    SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-下发码板任务 å¤±è´¥,SetPalletizingTaskFinishAck è¿”回:{res.resMsg}";
                                    continue;
                                }
                            
                                else
                                {
                                    Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-下发入库任务 æˆåŠŸ,SetPalletizingTaskFinishAck，参数: ç«™ç‚¹{rgvLocation}");
                                }
                            }


                        }
                        if (obj.R_ReqParseData)
@@ -87,7 +87,7 @@
                                placeX = (short)upiObj.MachineXCenter;
                                placeY = (short)upiObj.MachineYCenter;
                                placeZ = (short)upiObj.MachineZCenter;
                                if (upiObj.UpiStatus == (int)UpiStatusEnum.已码垛||upiObj.UpiStatus== (int)UpiStatusEnum.码垛中)
                                if (upiObj.UpiStatus == (int)UpiStatusEnum.已码垛 || upiObj.UpiStatus == (int)UpiStatusEnum.码垛中)
                                {
                                    continue;
                                }
@@ -195,6 +195,9 @@
                                    }
                                }


                                WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ12站点", "码包");

                                wmsDB.SaveChanges();
                            }
                        }

 CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/DataProcess_BZ21.cs

@@ -253,6 +253,10 @@
                                    }
                                }


                                WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ21", "合包");
                                WmsRecordUpiProcessHandler.SaveWmsRecordPackageProcess(wmsDB, upiObj, "BZ21", "合包");

                                wmsDB.SaveChanges();
                            }
                        }

 CC/iWareCC_ASRS/ThreadService/05_BZ30(ÆëÌ×ÑéÖ¤)/DataProcess_ValidateQiTao.cs

@@ -122,6 +122,8 @@
                            record.OpRemark = "下线";
                            wmsDB.mes_package_unline_record.Add(record);

                            WmsRecordUpiProcessHandler.SaveWmsRecordPackageProcess(wmsDB, package, "BZ30", "齐套验证");


                            wmsDB.SaveChanges();
                        }
@@ -136,6 +138,6 @@
            }
        }

   

    }
}

 CC/iWareCC_ASRS/iWareCC.csproj

@@ -153,6 +153,7 @@
    <Compile Include="Forms\SystemCheckForm.Designer.cs">
      <DependentUpon>SystemCheckForm.cs</DependentUpon>
    </Compile>
    <Compile Include="Handler\WmsRecordUpiProcessHandler.cs" />
    <Compile Include="Program.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="DeviceThreadFactory\DeviceThreadService\RgvThreadService\RgvTaskThreadService.cs" />

 CC/iWareSql/DataAccess/WmsRecordUpiProcessHandler.cs

ÎļþÒÑɾ³ý

 CC/iWareSql/iWareSql.csproj

@@ -55,7 +55,6 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="DataAccess\WmsRecordUpiProcessHandler.cs" />
    <Compile Include="DataAccess\TaskHandler.cs" />
    <Compile Include="DataAccess\AgvHandler.cs" />
    <Compile Include="DataAccess\Base_CodeItemsHandler.cs" />

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs

@@ -22,13 +22,16 @@
    private readonly SqlSugarRepository<SysConfig> _sysConfigRep;
    private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _mesBatchOrderUpiRep;
    private readonly SqlSugarRepository<Mes_Order_Gather> _mesOrderGatherRep;

    private readonly SqlSugarRepository<WmsRecordUpiProcess> _wmsRecordUpiProcessRep;
    private readonly SqlSugarRepository<WmsRecordPackageProcess> _wmsRecordPackageProcessRep;

    public WmsOperationTaskService(SqlSugarRepository<WmsRbLineTask> rep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
        , SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
        , SqlSugarRepository<SysConfig> sysConfigRep
        , SqlSugarRepository<Mes_BatchOrderUPI_New> mesBatchOrderUpiRep
        , SqlSugarRepository<Mes_Order_Gather> mesOrderGatherRep
        , SqlSugarRepository<WmsRecordUpiProcess> wmsRecordUpiProcessRep
        , SqlSugarRepository<WmsRecordPackageProcess> wmsRecordPackageProcessRep
        )
    {
        _sysConfigRep = sysConfigRep;
@@ -37,6 +40,8 @@
        _wmsStockQuanRep = wmsStockQuanRep;
        _mesBatchOrderUpiRep = mesBatchOrderUpiRep;
        _mesOrderGatherRep = mesOrderGatherRep;
        _wmsRecordUpiProcessRep = wmsRecordUpiProcessRep;
        _wmsRecordPackageProcessRep = wmsRecordPackageProcessRep;
    }


@@ -195,6 +200,21 @@
        {
            throw Oops.Oh($"没有找到包号{input.PackageCode}的汇总数据");
        }

        WmsRecordPackageProcess wmsRecordPackage = new WmsRecordPackageProcess();
        wmsRecordPackage = singlePackage.Adapt<WmsRecordPackageProcess>();
        wmsRecordPackage.CreateTime = DateTime.Now;
        wmsRecordPackage.Location = "BZ29";
        wmsRecordPackage.OperRemark = "核对标签";
        await _wmsRecordPackageProcessRep.InsertAsync(wmsRecordPackage);

        WmsRecordUpiProcess wmsRecordUpi = new WmsRecordUpiProcess();
        wmsRecordUpi = singleUpi.Adapt<WmsRecordUpiProcess>();
        wmsRecordUpi.CreateTime = DateTime.Now;
        wmsRecordUpi.Location = "BZ29";
        wmsRecordUpi.OperRemark = "核对标签";
        await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi);

        return singlePackage;
    }


 SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs

@@ -180,8 +180,9 @@
        }



        /// <summary>
        /// å†™å…¥é½å¥—结果
        /// å†™å…¥é½å¥—结果、解析结果
        /// </summary>
        /// <param name="deviceId"></param>
        /// <param name="value">true:表示 é½å¥—。false：不齐套</param>
@@ -196,21 +197,25 @@

                var view_stationObj = this.View.W_StationForWriteCommList.Where(x => x.StationCode == stationCode).FirstOrDefault();

                int i_result = 0;
                if (value)
                MessageModel b2 = null;
                if (stationCode == StationLocationEnum.BZ01.ToString())
                {
                    i_result = 998;
                }
                else
                {
                    i_result = 999;
                }
                MessageModel b2 = this.plcService.WriteValuePoint(stationObj.W_KittingInfo, i_result, view_stationObj.W_KittingInfo);
                if (!b2.result)
                {
                    msg = string.Format("向Station地址{0} å†™  " + value + "失败,返回结果:" + b2.resMsg,
                      stationObj.W_DataFinish);
                    return false;
                    int i_result = 0;
                    if (value)
                    {
                        i_result = 998;
                    }
                    else
                    {
                        i_result = 999;
                    }
                    b2 = this.plcService.WriteValuePoint(stationObj.W_KittingInfo, i_result, view_stationObj.W_KittingInfo);
                    if (!b2.result)
                    {
                        msg = string.Format("向Station地址{0} å†™  " + value + "失败,返回结果:" + b2.resMsg,
                          stationObj.W_DataFinish);
                        return false;
                    }
                }

                b2 = this.plcService.WriteValuePoint(stationObj.W_DataFinish, true, view_stationObj.W_DataFinish);

 SDA/iWareSda/Devices/4-Station/StationService/StationService.cs

@@ -407,7 +407,7 @@


        /// <summary>
        /// å†™å…¥é½å¥—结果
        /// å†™å…¥é½å¥—结果、解析结果
        /// </summary>
        /// <param name="deviceId"></param>
        /// <param name="value"></param>