优化备料单发料逻辑

Rodney Chen

5 天以前 beca28ecb3a730ffb33c21e0c55c729774725faf

 Tiger.Controllers.WMS/Controllers/WMSController.RePrintLabel.cs

@@ -98,8 +98,8 @@
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/RePrintLabel/ScanItem")]
        public async Task<IActionResult> RePrintLabel_ScanItemAsync([FromBody] ApiAction<BaseInput> action)
        [Route("api/[controller]/RePrintLabel/Scan")]
        public async Task<IActionResult> RePrintLabel_ScanAsync([FromBody] ApiAction<BaseInput> action)
        {
            ApiAction response;
            IRePrintLabel trans = null;
@@ -137,5 +137,49 @@
            return Ok(response);
        }

        /// <summary>
        /// 扫描入库
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/RePrintLabel/ScanItem")]
        public async Task<IActionResult> RePrintLabel_ScanItemAsync([FromBody] ApiAction<BaseInput> action)
        {
            ApiAction response;
            IRePrintLabel trans = null;
            try
            {
                if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
                {
                    trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IRePrintLabel;
                    if (!trans.IsFinished)
                    {
                        if (action.IsAsync)
                        {
                            response = action.GetResponse(await trans.Scan(action.Data));
                        }
                        else
                        {
                            lock (trans.TransLock) { response = action.GetResponse(trans.ScanItem(action.Data).Result); }
                        }
                    }
                    else
                    {
                        response = action.GetResponse($"Transaction Error: 标准上架事务[ID:{action.ID}]已经关闭，请重新打开标准上架功能", false);
                    }
                }
                else
                {
                    response = action.GetResponse($"Transaction Error: 标准上架事务[ID:{action.ID}]数据丢失，请重新打开标准上架功能", false);
                }
            }
            catch (System.Exception ex)
            {
                response = action.GetResponse().CatchExceptionWithLog(ex);
            }
            trans?.AddHistory(Request, action);
            return Ok(response);
        }
    }
}