服务端的TigerApi 框架,基于.NET6 2024 版本
Rodney Chen
2025-03-24 2df22d081aa4d3677b474962e9bbc38db8efa536
Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
已修改3个文件
已添加3个文件
775 ■■■■■ 文件已修改
Tiger.Business.WMS/ERP/WMS_U9C.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs 582 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Controllers.WMS/Controllers/WMSController.Count.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Controllers.WMS/Controllers/WMSController.Print_BIZ_U9_ASN.cs 141 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.IBusiness.WMS/Transaction/IPrint_BIZ_U9_ASN.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Business.WMS/ERP/WMS_U9C.cs
@@ -62,13 +62,15 @@
                List<CreateRcvBySrcASNParam> param = new();
                param.Add(input.CreateRcvBySrcASNParam);
                var response = await HttpHelper.PostAsync(CreateRcvBySrcASNUrl, JsonConvert.SerializeObject(param), new Dictionary<string, string>() { { "token", input.token } });
                //var response = new ApiAction("{\"ResCode\":0,\"Success\":true,\"ResMsg\":null,\"Data\":[{\"IsSucess\":true,\"U9CVersion\":null,\"OtherID\":\"WMS\",\"ID\":1002503210000100,\"Code\":\"YDRC250300003\",\"ErrorMsg\":null}]}");
                var result = JsonConvert.DeserializeObject<U9CResult2>(response.Message);
                if (result != null)
                {
                    if (result.Success && result.Data[0].IsSucess)
                    {
                        action.Data = result.Data;
                        Logger.Interface.Info($"新增收货单-来源ASN单接口提交Json: {JsonConvert.SerializeObject(param)},返回Json: {response.Message}");
                      // Logger.Interface.Info($"新增收货单-来源ASN单接口提交Json: {JsonConvert.SerializeObject(param)},返回Json: {response.Message}");
                    }
                    else
                    {
@@ -188,14 +190,16 @@
                        Logger.Interface.Info($"U9C登录token: {input.token}");
                    }
                }
                var response = await HttpHelper.PostAsync(SubmitLineUrl, JsonConvert.SerializeObject(input.param), new Dictionary<string, string>() { { "token", input.token } });
                var _params = new List<SubmitLineInputParam>();
                _params.Add(input.param);
                var response = await HttpHelper.PostAsync(SubmitLineUrl, JsonConvert.SerializeObject(_params), new Dictionary<string, string>() { { "token", input.token } });
                var result = JsonConvert.DeserializeObject<U9CResult2>(response.Message);
                if (result != null)
                {
                    if (result.Success && result.Data[0].IsSucess)
                    {
                        action.Data = result.Data;
                        Logger.Interface.Info($"收货单-行提交接口提交Json: {JsonConvert.SerializeObject(input.param)},返回Json: {response.Message}");
                        Logger.Interface.Info($"收货单-行提交接口提交Json: {JsonConvert.SerializeObject(_params)},返回Json: {response.Message}");
                    }
                    else
                    {
@@ -234,14 +238,16 @@
                        Logger.Interface.Info($"U9C登录token: {input.token}");
                    }
                }
                var response = await HttpHelper.PostAsync(ApproveLineUrl, JsonConvert.SerializeObject(input.param), new Dictionary<string, string>() { { "token", input.token } });
                var _params = new List<SubmitLineInputParam>();
                _params.Add(input.param);
                var response = await HttpHelper.PostAsync(ApproveLineUrl, JsonConvert.SerializeObject(_params), new Dictionary<string, string>() { { "token", input.token } });
                var result = JsonConvert.DeserializeObject<U9CResult2>(response.Message);
                if (result != null)
                {
                    if (result.Success && result.Data[0].IsSucess)
                    {
                        action.Data = result.Data;
                        Logger.Interface.Info($"收货单-行审核接口提交Json: {JsonConvert.SerializeObject(input.param)},返回Json: {response.Message}");
                        Logger.Interface.Info($"收货单-行审核接口提交Json: {JsonConvert.SerializeObject(_params)},返回Json: {response.Message}");
                    }
                    else
                    {
Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,582 @@
using Rhea.Common;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Tiger.Model;
using Tiger.IBusiness;
using Tiger.Model.MES.Yada;
using Tiger.Model.Entitys.MES.U9C;
using System.Security.Policy;
using Tiger.Model.Entitys.MES.Position;
namespace Tiger.Business.WMS.Transaction
{
    /// <summary>
    /// (U9)来料打印清点事务
    /// </summary>
    public class Print_BIZ_U9_ASN : WmsTask, IPrint_BIZ_U9_ASN
    {
        public IPrint_BIZ_U9_ASN Init(string id, string userCode, string apiHost, string orgCode)
        {
            base.Init(id, userCode, apiHost, orgCode);
            //加载已经清点数据
            LoadData();
            Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
            return this;
        }
        #region Propertys & Variables
        //private List<WmsOrder<BIZ_U9_ASN>> _OrderList { get; set; } = new();
        private List<string> OrderList = new();
        private List<BIZ_U9_ASN_SN> CurSn = new();
        private List<BIZ_U9_ASN_SN> ScanList = new();
        #endregion
        #region Functions
        /// <summary>
        /// åˆå§‹åŒ–清点数据
        /// </summary>
        private void LoadData()
        {
            OrderList = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.RECEIVER == UserCode && SqlFunc.Subqueryable<BIZ_U9_ASN>().Where(s => s.ORDER_NO == q.ORDER_NO && s.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue()).Any()).Select(q => q.ORDER_NO).ToList();
        }
        /// <summary>
        /// æ‰«æå…¥å£
        /// </summary>
        public async Task<ApiAction<ScanOutput>> Scan(BaseInput input)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput());
            try
            {
                if (input.SN.IsNullOrEmpty())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("条码不能为空");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.SnEmptyFailure");
                    return SetOutPutMqttMsg(action, input.Locale);
                }
                //扫描物料并复核
                else //if (Command == "Normal")
                {
                    action = await ScanItem(input);
                }
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetScan();
                //action.CatchExceptionWithLog(ex, $"扫描[{input.SN}]异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale);
        }
        /// <summary>
        /// æ‰«æç‰©æ–™å¹¶å¤æ ¸
        /// </summary>
        public async Task<ApiAction<ScanOutput>> ScanItem(BaseInput input)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
            try
            {
                //解析条码
                Barcode barcode = new Barcode(input.SN);
                if (barcode.IsException)
                {
                    throw barcode.AnalyseException;
                }
                //非法条码
                else if (!barcode.IsRegular)
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("条码为非法条码");
                    action.LocaleMsg = Biz.L("WMS.WmsItem.Barcode.IllegalFailure", input.SN);
                    return SetOutPutMqttMsg(action, input.Locale); ;
                }
                if (barcode.Type == Barcode.Types.OuterPackage)
                {
                    CurSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.CARTON_NO == barcode.SN).ToList();
                }
                else
                {
                    CurSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.SN == barcode.SN).ToList();
                    foreach (var sn in CurSn)
                    {
                        sn.META_SN = input.SN;
                    }
                }
                if (CurSn.IsNullOrEmpty())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("ASN单中不存在条码[{0}]");
                    action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.SnNotExists", input.SN);
                    return SetOutPutMqttMsg(action, input.Locale); ;
                }
                if (CurSn.First().AUTH_ORG != input.AuthOption.CurOrg)
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L($"条码所属组织[{0}]与当前登录组织[{1}]不一致,请重新选择组织");
                    action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.OrgNotCorrect", CurSn.First().AUTH_ORG, input.AuthOption.CurOrg);
                    return SetOutPutMqttMsg(action, input.Locale); ;
                }
                //验证条码是否正确
                if (CurSn.First().STATUS > WMS_ITEM.STATUSs.Incoming.GetValue())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("状态[{0}]异常,请重新扫描");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", CurSn.First().STATUS.GetEnumDesc<WMS_ITEM.STATUSs>());
                    return SetOutPutMqttMsg(action, input.Locale); ;
                }
                //执行清点数据处理
                foreach (var sn in CurSn)
                {
                    sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
                    sn.RECEIVER = UserCode;
                    sn.RECEIVE_DATE = DateTime.Now;
                }
                //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
                var _CurSn = CurSn.Clone();
                AddCommitAction("Counted", () =>
                {
                    //使用统一的事务DB对象
                    var db = GetCommitDB();
                    //数据保存逻辑
                    db.Updateable<BIZ_U9_ASN>(UserCode).SetColumns(q => q.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue()).Where(q => q.ORDER_NO == _CurSn.First().ORDER_NO).ExecuteCommand();
                    db.Storageable(_CurSn, UserCode).ExecuteCommand();
                });
                //完成所有处理后使用事务保存数据
                action = DoIfFinish(action, input.Locale);
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetScan();
                //action.CatchExceptionWithLog(ex, $"扫描条码[{0}]复核异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale);
        }
        /// <summary>
        /// å®Œæˆæ‰€æœ‰å¤„理后使用事务保存数据
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale)
        {
            //保存数据库
            SaveCommitListToDB();
            if (!OrderList.Contains(CurSn.First().ORDER_NO))
            {
                OrderList.Add(CurSn.First().ORDER_NO);
            }
            ScanList.AddRange(CurSn);
            // è¿”回数据
            action.Data.Data = ScanList;
            //action.LocaleMsg = Biz.L($"条码[{0}]清点成功!");
            action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.CountSuccess", CurSn.First().SN);
            //重置工序
            ResetScan();
            return SetOutPutMqttMsg(action, locale); ;
        }
        /// <summary>
        /// åˆ é™¤å½“前所有已清点记录
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction> DeleteScannedList()
        {
            var action = new ApiAction();
            try
            {
                foreach (var sn in ScanList)
                {
                    sn.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
                    sn.RECEIVER = null;
                    sn.RECEIVE_DATE = DateTime.MinValue;
                }
                //var historys = new List<WMS_ITEM_HIS>();
                //var items = await Biz.Db.Queryable<WMS_ITEM>().Where(q => ScanList.Select(s => s.SN).Contains(q.SN)).ToListAsync();
                //foreach (var item in items)
                //{
                //    var order = item.TRANS_CODE;
                //    item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
                //    item.SOURCE_CODE = "";
                //    item.SOURCE_ORDER = "";
                //    item.SOURCE_LINE = "";
                //    item.TRANS_CODE = item.SOURCE_CODE;
                //    item.TRANS_NO = item.SOURCE_ORDER;
                //    item.TRANS_LINE = item.SOURCE_LINE;
                //    historys.Add(new WMS_ITEM_HIS(item, $"条码[{item.SN}]取消清点,操作单据[{order}]"));
                //}
                //使用统一的事务DB对象
                var db = GetCommitDB();
                var dbTran = db.UseTran(() =>
                {
                    db.Updateable(ScanList, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommandAsync();
                    //db.Updateable(items, UserCode).ExecuteCommand();
                    //db.Insertable(historys, UserCode).ExecuteCommand();
                });
                if (dbTran.IsSuccess)
                {
                    ScanList.Clear();
                }
                else
                {
                    Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
                    //抛出异常
                    throw dbTran.ErrorException;
                }
            }
            catch (System.Exception ex)
            {
                //return action.CatchExceptionWithLog(ex, Biz.L("删除当前所有已清点记录异常"));
                return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.DeleteScanListException"));
            }
            return action;
        }
        /// <summary>
        /// åˆ é™¤å½“前用户的已扫单个记录
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction> DeleteScannedSn(BaseInput input)
        {
            var action = new ApiAction();
            try
            {
                //var item = await Biz.Db.Queryable<WMS_ITEM>().Where(q => q.SN == input.SN).FirstAsync();
                //var order = item.TRANS_CODE;
                //item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
                //item.SOURCE_CODE = "";
                //item.SOURCE_ORDER = "";
                //item.SOURCE_LINE = "";
                //item.TRANS_CODE = item.SOURCE_CODE;
                //item.TRANS_NO = item.SOURCE_ORDER;
                //item.TRANS_LINE = item.SOURCE_LINE;
                //使用统一的事务DB对象
                var db = GetCommitDB();
                var dbTran = db.UseTran(() =>
                {
                    db.Updateable<BIZ_U9_ASN_SN>(UserCode).SetColumns(q => q.STATUS == WMS_ITEM.STATUSs.Incoming.GetValue())
                        .SetColumns(q => q.RECEIVER == null)
                        .SetColumns(q => q.RECEIVE_DATE == DateTime.MinValue)
                        .Where(q => q.SN == input.SN).ExecuteCommand();
                    //db.Updateable(item, UserCode).ExecuteCommand();
                    //db.Insertable(new WMS_ITEM_HIS(item, $"条码[{item.SN}]取消清点,操作单据[{order}]"), UserCode).ExecuteCommand();
                });
                if (dbTran.IsSuccess)
                {
                    ScanList.RemoveAll(q => q.SN == input.SN);
                }
                else
                {
                    Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
                    //抛出异常
                    throw dbTran.ErrorException;
                }
            }
            catch (System.Exception ex)
            {
                //return action.CatchExceptionWithLog(ex, Biz.L("删除已清点条码[{0}]异常"));
                return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.DeleteScannedSnException", input.SN));
            }
            return action;
        }
        /// <summary>
        ///  èŽ·å–æœ¬æ¬¡å·²æ¸…ç‚¹çš„ç‰©æ–™åˆ—è¡¨ï¼ˆå¸¦åˆ†é¡µï¼‰
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction<PageAble<BIZ_U9_ASN_SN>>> GetScannedList(BaseInputWithPage input)
        {
            var action = new ApiAction<PageAble<BIZ_U9_ASN_SN>>();
            action.Data = new PageAble<BIZ_U9_ASN_SN>();
            action.Data.pageSize = input.pageSize;
            action.Data.pageIndex = input.pageIndex;
            action.Data.totals = ScanList.Count;
            action.Data.data = ScanList.Skip((input.pageIndex - 1) * input.pageSize).Take(input.pageSize).ToList();
            //action.Data = query;
            return action;
        }
        /// <summary>
        ///  èŽ·å–å½“å‰æ‰€æœ‰å•æ®ä¿¡æ¯
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction<List<BIZ_U9_ASN>>> GetOrderList()
        {
            var action = new ApiAction<List<BIZ_U9_ASN>>();
            action.Data = await Biz.Db.Queryable<BIZ_U9_ASN>().Where(q => OrderList.Contains(q.ORDER_NO)).IncludesAllFirstLayer().ToListAsync();
            if (!action.Data.IsNullOrEmpty())
            {
                foreach (var order in action.Data)
                {
                    foreach (var dtl in order.Details)
                    {
                        dtl.SnList = order.SnList.Where(q => q.LINE_NO == dtl.LINE_NO).OrderByDescending(q => q.STATUS).ToList();
                        dtl.QTY_COUNTED = dtl.SnList.Where(q => q.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue()).Sum(q => q.QTY);
                    }
                    order.IsFinished = !order.Details.Where(q => q.QTY != q.QTY_COUNTED).Any();
                }
            }
            return action;
        }
        /// <summary>
        ///  ç”Ÿæˆæ”¶è´§å•:调用U9新增收货单接口
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction> SetGiftQty(BaseInput input)
        {
            var action = new ApiAction();
            try
            {
                var dtl = input?.Data?.JsonToObject<BIZ_U9_ASN_DTL>();
                if ((dtl?.ID ?? "").IsNullOrEmpty())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L($"提交的收货单明细ID不能为空");
                    action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.SetGiftQty.DetailIDIsNull");
                    return action;
                }
                //使用统一的事务DB对象
                var db = GetCommitDB();
                await db.Updateable(dtl, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.QTY_GIFT }).ExecuteCommandAsync();
            }
            catch (System.Exception ex)
            {
                //return action.CatchExceptionWithLog(ex, Biz.L("设置收货单明细赠品数量为异常"));
                return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.SetGiftQtyException"));
            }
            return action;
        }
        /// <summary>
        /// ç”Ÿæˆæ”¶è´§å•:调用U9新增收货单接口
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public async Task<ApiAction> GenerateReceipt(BaseInput input)
        {
            var action = new ApiAction();
            var orderNo = input.Data;
            try
            {
                var order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == orderNo).IncludesAllFirstLayer().FirstAsync();
                if (order.IsNullOrEmpty())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L($"找不到送货单[{0}]的单据信息,请提交正确的单号");
                    action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.ASNNotExists", orderNo);
                    return action;
                }
                //验证条码是否正确
                if (order.STATUS != BIZ_U9_ASN.STATUSs.Counting.GetValue())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("生成收货单:送货单状态[{0}]异常");
                    action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.StatusException", order.STATUS.GetEnumDesc<BIZ_U9_ASN.STATUSs>());
                    return action;
                }
                //查询是否清点完成
                var noFinish = order.Details.Where(q => q.QTY != order.SnList.Where(s => s.LINE_NO == q.LINE_NO && (s.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).Sum(s => s.QTY));
                if (noFinish.Any())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("送货单[{0}]未清点完成,请先清点完成,未完成清点的行号如下:{1}");
                    action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.NoFinishCounting", orderNo, string.Join(",", noFinish.Select(q => q.LINE_NO)));
                    return action;
                }
                var iInput = new CreateRcvBySrcASNInput
                {
                    userId = UserCode,
                    IsLogin = true,
                    CreateRcvBySrcASNParam = new()
                    {
                        aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO { ASNLineKey = q.ID, TransQty = new() { m_amount1 = q.QTY } }).ToList(),
                    }
                };
                var result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
                if (!result.IsSuccessed)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = result.LocaleMsg;
                    return action;
                }
                //根据接口返回收货单单号查询单据明细,并创建条码明细
                var receipt = new BIZ_U9_RECEIPT();
                receipt.Details = new();
                receipt.SnList = new();
                DbClient U9Cdb = Biz.DataSource["YadaU9C"].Client;
                var list = U9Cdb.Queryable<mes_ReturnedDocInfo>().Where(x => x.RcvId == result.Data[0].ID.ToDouble() && x.DocNo == result.Data[0].Code).ToList();
                if (list != null && list.Count > 0)
                {
                    receipt.ID = list.First().RcvId.ToString();
                    receipt.AUTH_ORG = order.AUTH_ORG;
                    receipt.STATUS = BIZ_U9_RECEIPT.STATUSs.InQC.GetValue();
                    receipt.ORDER_NO = list.First().DocNo;
                    receipt.SUPP_CODE = list.First().SupplierCode;
                    receipt.SUPP_NAME = list.First().SupplierName;
                    receipt.RECEIVER = UserCode;
                    receipt.RECEIVE_DATE = DateTime.Now;
                    receipt.ASN_ID = order.ID;
                    receipt.ASN_NO = order.ORDER_NO;
                    receipt.ORDER_DATE = list.First().ModifiedOn;
                    receipt.HANDLED = 0;
                    receipt.HANDLED_DATE = DateTime.Now;
                    foreach (var item in list)
                    {
                        var asnDtl = order.Details.First(q => q.ID == item.SrcASNDocLineId.ToString());
                        BIZ_U9_RECEIPT_DTL receiptDt = new()
                        {
                            ID = item.RcvLineId.ToString(),
                            AUTH_ORG = receipt.AUTH_ORG,
                            STATUS = BIZ_U9_RECEIPT.STATUSs.InQC.GetValue(),
                            ORDER_NO = item.DocNo,
                            LINE_NO = item.DocLineNo.ToString(),
                            ITEM_CODE = item.ItemCode,
                            QTY = item.EyeballingQtyTU.ToDouble(), // mes单据数量 --U9退补数量
                            QTY_GIFT = asnDtl.QTY_GIFT,
                            ASN_ID = item.SrcASNDocId.ToString(),
                            ASN_NO = asnDtl.ORDER_NO,
                            ASN_LINE_ID = item.SrcASNDocLineId.ToString(),
                            ASN_LINE = asnDtl.LINE_NO,
                            ERP_CODE = item.ItemCode1,
                        };
                        receipt.Details.Add(receiptDt);
                    }
                    foreach (var sn in order.SnList)
                    {
                        var dtl = receipt.Details.First(q => q.ASN_LINE == sn.LINE_NO);
                        BIZ_U9_RECEIPT_SN receiptSn = new()
                        {
                            AUTH_ORG = dtl.AUTH_ORG,
                            ORDER_NO = dtl.ORDER_NO,
                            LINE_NO = dtl.LINE_NO,
                            SN = sn.SN,
                            META_SN = sn.META_SN,
                            ITEM_CODE = sn.ITEM_CODE,
                            STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
                            QTY = sn.QTY,
                            UNIT = sn.UNIT,
                            IS_OK = sn.IS_OK,
                            IS_IN = sn.IS_IN,
                            LOTNO = sn.LOTNO,
                            CARTON_NO = sn.CARTON_NO,
                            PALLET_NO = sn.PALLET_NO,
                        };
                        receipt.SnList.Add(receiptSn);
                    }
                }
                //更新库存表信息
                var items = MainDB.Queryable<WMS_ITEM>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
                var historys = new List<WMS_ITEM_HIS>();
                foreach (var item in items)
                {
                    item.AUTH_ORG = receipt.AUTH_ORG;
                    item.STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue();
                    item.SOURCE_CODE = item.TRANS_CODE;
                    item.SOURCE_ORDER = item.TRANS_NO;
                    item.SOURCE_LINE = item.TRANS_LINE;
                    item.TRANS_CODE = nameof(BIZ_U9_RECEIPT);
                    item.TRANS_NO = receipt.ORDER_NO;
                    item.TRANS_LINE = receipt.SnList.First(q => q.SN == item.SN).LINE_NO;
                    historys.Add(new WMS_ITEM_HIS(item, $"送货单[{order.ORDER_NO}]的条码[{item.SN}]生成收货单[{receipt.ORDER_NO}],待检验完成后可入库"));
                }
                var pkgs = MainDB.Queryable<WMS_ITEM_PKG>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
                foreach (var item in pkgs)
                {
                    item.AUTH_ORG = receipt.AUTH_ORG;
                    item.SOURCE_CODE = item.TRANS_CODE;
                    item.SOURCE_ORDER = item.TRANS_NO;
                    item.SOURCE_LINE = item.TRANS_LINE;
                    item.TRANS_CODE = nameof(BIZ_U9_RECEIPT);
                    item.TRANS_NO = receipt.ORDER_NO;
                    item.TRANS_LINE = receipt.SnList.First(q => q.SN == item.SN).LINE_NO;
                }
                order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
                order.RECEIVER_ID = receipt.ID;
                order.RECEIVER_NO = receipt.ORDER_NO;
                order.RECEIVER = UserCode;
                order.RECEIVE_DATE = DateTime.Now;
                //使用统一的事务DB对象
                var db = GetCommitDB();
                var dbTran = db.UseTran(() =>
                {
                    db.Updateable(items, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, q.STATUS, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
                    db.Updateable(pkgs, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
                    db.Insertable(historys, UserCode).ExecuteCommand();
                    db.Updateable(order, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE, q.RECEIVER_ID, q.RECEIVER_NO }).ExecuteCommand();
                    db.Insertable(receipt, UserCode).ExecuteCommand();
                    db.Insertable(receipt.Details, UserCode).ExecuteCommand();
                    db.Insertable(receipt.SnList, UserCode).ExecuteCommand();
                });
                if (dbTran.IsSuccess)
                {
                    //action.LocaleMsg = Biz.L($"送货单[{0}]生成收货单[{1}]成功");
                    action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.Success", order.ORDER_NO, receipt.ORDER_NO);
                }
                else
                {
                    Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
                    //抛出异常
                    throw dbTran.ErrorException;
                }
            }
            catch (System.Exception ex)
            {
                //return action.CatchExceptionWithLog(ex, Biz.L("送货单[{0}]生成收货单异常"));
                return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceiptException", orderNo));
            }
            return action;
        }
        #endregion
        /// <summary>
        /// é‡ç½®å½“前操作,有需要则重写此方法
        /// </summary>
        public override void ResetScan()
        {
            base.ResetScan();
            Command = null;
            CurInvItem = null;
            CurScanShelf = null;
            CurSn = null;
        }
        public override bool Close(bool needSaveHistoryLog = false)
        {
            this.IsFinished = true;
            return IsFinished ? base.Close(needSaveHistoryLog) : IsFinished;
        }
    }//endClass
}
Tiger.Controllers.WMS/Controllers/WMSController.Count.cs
@@ -67,7 +67,9 @@
                {
                    site = count.AUTH_ORG,
                };
                var data = _stockBus.GetStockInfo(_data);
                //从T100获取库存信息
                //var data = _stockBus.GetStockInfo(_data);
                var data = new List<SaleOutInfoDetailDTO>();
                response = response.GetResponse(DI.Resolve<IBS>().GenerateCount(count,data));
                
            }
Tiger.Controllers.WMS/Controllers/WMSController.Print_BIZ_U9_ASN.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,141 @@
using System;
using System.Threading.Tasks;
using Rhea.Common;
using Tiger.Model;
using Tiger.IBusiness;
using Microsoft.AspNetCore.Mvc;
using Tiger.Model.Minsun;
using Autofac;
namespace Tiger.Api.Controllers.WMS
{
    public partial class WMSController : ControllerBase
    {
        /// <summary>
        /// GetTransaction(ApiAction(Data:UserId))
        /// æ ¹æ®ApiAction的id返回一个(U9)来料打印清点事务
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/Print_U9Asn/GetTransaction")]
        public IActionResult Print_BIZ_U9_ASN_GetTransaction([FromBody] ApiAction<USER> action)
        {
            ApiAction response;
            IPrint_BIZ_U9_ASN trans = null;
            try
            {
                if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
                {
                    trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IPrint_BIZ_U9_ASN;
                }
                else
                {
                    trans = AutoFacContainer.Instance.Resolve<IPrint_BIZ_U9_ASN>().Init(action.ID, action.Data?.USER_CODE, Request.Host.Value, action.Data?.ORG_CODE);
                    iBiz.WMS.Context.NewTransaction(HttpContext, trans);
                }
                response = action.GetResponse();
            }
            catch (System.Exception ex)
            {
                response = action.GetResponse().CatchExceptionWithLog(ex);
            }
            trans?.AddHistory(Request, action);
            return Ok(response);
        }
        /// <summary>
        /// CloseTransaction(ApiAction)
        /// å…³é—­äº‹åŠ¡
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/Print_U9Asn/CloseTransaction")]
        public IActionResult Print_BIZ_U9_ASN_CloseTransaction([FromBody] ApiAction action)
        {
            ApiAction response;
            IPrint_BIZ_U9_ASN trans = null;
            try
            {
                if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
                {
                    trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IPrint_BIZ_U9_ASN;
                    if (!trans.IsFinished)
                    {
                        if (action.IsAsync)
                        {
                            response = action.GetResponse(trans.Close());
                        }
                        else
                        {
                            lock (trans.TransLock) { response = action.GetResponse(trans.Close()); }
                        }
                        response.Message = $"(U9)来料打印清点事务[ID:{action.ID}]关闭{(response.IsSuccessed ? "成功" : "失败")}";
                    }
                    else
                    {
                        response = action.GetResponse($"Transaction Error: (U9)来料打印清点事务[ID:{action.ID}]已经关闭", false);
                    }
                }
                else
                {
                    response = action.GetResponse($"Transaction Error: (U9)来料打印清点事务[ID:{action.ID}]已经关闭", false);
                }
            }
            catch (System.Exception ex)
            {
                response = action.GetResponse().CatchExceptionWithLog(ex);
            }
            trans?.AddHistory(Request, action);
            return Ok(response);
        }
        /// <summary>
        /// æ‰«æå…¥å£
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/Print_U9Asn/Scan")]
        public async Task<IActionResult> Print_BIZ_U9_ASN_ScanAsync([FromBody] ApiAction<BaseInput> action)
        {
            ApiAction response;
            IPrint_BIZ_U9_ASN trans = null;
            try
            {
                if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
                {
                    trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IPrint_BIZ_U9_ASN;
                    if (!trans.IsFinished)
                    {
                        if (action.IsAsync)
                        {
                            response = action.GetResponse(await trans.Scan(action.Data));
                        }
                        else
                        {
                            lock (trans.TransLock) { response = action.GetResponse(trans.Scan(action.Data).Result); }
                        }
                    }
                    else
                    {
                        response = action.GetResponse($"Transaction Error: (U9)来料打印清点事务[ID:{action.ID}]已经关闭,请重新打开(U9)来料打印清点功能", false);
                    }
                }
                else
                {
                    response = action.GetResponse($"Transaction Error: (U9)来料打印清点事务[ID:{action.ID}]数据丢失,请重新打开(U9)来料打印清点功能", false);
                }
            }
            catch (System.Exception ex)
            {
                response = action.GetResponse().CatchExceptionWithLog(ex);
            }
            trans?.AddHistory(Request, action);
            return Ok(response);
        }
    }
}
Tiger.IBusiness.WMS/Transaction/IPrint_BIZ_U9_ASN.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
using Rhea.Common;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Tiger.Model;
namespace Tiger.IBusiness
{
    /// <summary>
    /// (U9)来料打印清点事务
    /// </summary>
    public interface IPrint_BIZ_U9_ASN : IWmsTask
    {
        public IPrint_BIZ_U9_ASN Init(string id, string userCode, string apiHost, string orgCode);
        /// <summary>
        /// æ‰«æå…¥å£
        /// </summary>
        public Task<ApiAction<ScanOutput>> Scan(BaseInput input);
        public bool Close(bool needSaveHistoryLog = false);
    }
}
Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
@@ -233,6 +233,13 @@
    {
        public TransQty TransQty { get; set; }
        public string ASNLineKey { get; set; }
        public List<BinInfoList> BinInfoList { get; set; }
    }
    public class BinInfoList {
        public Location Bin { get; set; }
        public double LocationQtySU { get; set; }
        public double LocationQtyTU { get; set; }
    }
    public class TransQty