1

Zhang-Hong-Lin

2025-03-11 f9e3252c454e476ed1ee00b081d83751f623fc3e

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs

@@ -88,7 +88,7 @@
                {
                    #region ç”Ÿæˆå‰”除货位入库任务
                    //判断整形机信号
                    if(!OHTJob.oHTReadData.R_ZXJ_TC_isready&& !OHTJob.oHTReadData.R_TCMode_TC)
                    if (!OHTJob.oHTReadData.R_ZXJ_TC_isready && !OHTJob.oHTReadData.R_TCMode_TC)
                    {
                        throw new Exception($"整形机投入使用信号为false");
                    }
@@ -135,7 +135,7 @@
                    var batch = _batchInfoRepository.QueryFirst(v => v.Id == 1);
                    //查询库存物料库存信息
                    var stocks = _StockInfoRepository.QueryData(v => v.Remark == 3 && v.BatchNo == batch.OutBatch && v.StockStatus == 0)
                        .OrderBy(v => v.CreateDate).ToList();
                            .OrderBy(v => v.CreateDate).ToList();
                    if (stocks.Count <= 0)
                    {
                        throw new Exception($"当前库存中没有【{batch.materType}】（0自产 1外购）且批次为【{batch.OutBatch}】的物料");
@@ -169,18 +169,19 @@
                }
                catch (Exception ex)
                {
                    _unitOfWorkManage.RollbackTran();
                    _ErrormsginfoService.UpdateErrorMsg(ex.Message, 6);
                }

                try
                {
                    #region ç”Ÿæˆå…¥åº“任务
                    

                    //if (!OHTJob.oHTReadData.R_GZJ_isWork)
                    //{
                    //    throw new Exception($"规整机投入使用信号为false");
                    //}

                    if (!OHTJob.oHTReadData.R_GZJ_isWork)
                    {
                        throw new Exception($"规整机投入使用信号为false");
                    }
                    var Inisout = _outStockRepository.QueryFirst(v => v.Id == 1);
                    //入库
                    if (Inisout.InOut==1)