更新收货单提交按行提交已完成清点的行，上架增加IQC审核的判断

Rodney Chen

2025-04-03 e163a27328c805ffec7c894259430f76f0881d00

 Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs

@@ -402,12 +402,13 @@
                    return action;
                }

                //查询是否清点完成
                //查询是否存在清点完成的行明细，如果有则先提交完成的行，如果没有则报错
                var finishNotSubmit = order.Details.Where(q => SqlFunc.IsNullOrEmpty(q.RECEIVER_NO) && 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)).ToList();
                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())
                if (!finishNotSubmit.Any())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("送货单[{0}]未清点完成，请先清点完成，未完成清点的行号如下：{1}");
                    //action.LocaleMsg = Biz.L("送货单[{0}]没有清点完成可以提交的行，未完成清点的行号如下：{1}");
                    action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.NoFinishCounting", orderNo, string.Join("，", noFinish.Select(q => q.LINE_NO)));
                    return action;
                }
@@ -418,7 +419,7 @@
                    IsLogin = true,
                    CreateRcvBySrcASNParam = new()
                    {
                        aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO
                        aSNToRcvTransDTOs = finishNotSubmit.Select(q => new ASNToRcvTransDTO
                        {
                            ASNLineKey = q.ID,
                            TransQty = new() { m_amount1 = q.QTY },
@@ -459,7 +460,7 @@

                    foreach (var item in list)
                    {
                        var asnDtl = order.Details.First(q => q.ID == item.SrcASNDocLineId.ToString());
                        var asnDtl = finishNotSubmit.First(q => q.ID == item.SrcASNDocLineId.ToString());
                        BIZ_U9_RECEIPT_DTL receiptDt = new()
                        {
                            ID = item.RcvLineId.ToString(),
@@ -475,8 +476,16 @@
                            ASN_LINE_ID = item.SrcASNDocLineId.ToString(),
                            ASN_LINE = asnDtl.LINE_NO,
                            ERP_CODE = item.ItemCode1,
                            ERP_STATUS_CODE = item.Status.ToString(),
                            ERP_STATUS_NAME = item.StatusName,
                        };
                        receipt.Details.Add(receiptDt);
                        asnDtl.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
                        asnDtl.RECEIVER_ID = item.RcvId.ToString();
                        asnDtl.RECEIVER_NO = item.DocNo;
                        asnDtl.RECEIVER_LINE = item.DocLineNo.ToString();
                        asnDtl.RECEIVER = UserCode;
                        asnDtl.RECEIVE_DATE = DateTime.Now;
                    }

                    foreach (var sn in order.SnList)
@@ -529,11 +538,12 @@
                    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;
                if (!noFinish.Any())
                {
                    order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
                    order.RECEIVER = UserCode;
                    order.RECEIVE_DATE = DateTime.Now;
                }

                //使用统一的事务DB对象
                var db = GetCommitDB();
@@ -543,6 +553,7 @@
                    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.Updateable(finishNotSubmit, 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();