生产报工和生产超领的后台逻辑

啊鑫

2024-12-24 e328deb435c326025f3b7a510011e69d0353e69c

 service/Warehouse/MesItemBlManager.cs

@@ -235,7 +235,6 @@
                .Count();

            if (itemCount > 0)
            {
                // 更新已存在的物料明细数量
                db.Updateable<MesInvItemOutItems>()
                    .SetColumns(i =>
@@ -243,9 +242,7 @@
                    .Where(i =>
                        i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
                    .ExecuteCommand();
            }
            else
            {
                // 插入新的物料明细记录
                db.Insertable(new MesInvItemOutItems
                {
@@ -267,11 +264,10 @@
                    ErpId = womdab.Eid,
                    ErpAutoid = womdab.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012,
                    ItemId = blDetail.Bld012
                    // Unit = blDetail.Bld009,
                    // DepotId = (int)stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
            }

            // 插入出库单条码明细
            db.Insertable(new MesInvItemOutCDetails
@@ -332,7 +328,7 @@
                WorkNo = blDetail.Bld001, // Matches C_QTCK_D.Bld001
                WorkLine = blDetail.Bld013, // Matches C_QTCK_D.Bld013
                SuppNo = stockBarcode.SuppNo,
                ItemId = stockBarcode.ItemId,
                ItemId = stockBarcode.ItemId
                // CkDepot = stockBarcode.DepotsId
            }).IgnoreColumns(true).ExecuteCommand();

@@ -363,13 +359,11 @@
                .First();

            if ((blDetail1.Bld007 ?? 0) <= (blDetail1.Bld008 ?? 0))
            {
                // 更新明细完成状态
                db.Updateable<MesItemBlDetail>()
                    .SetColumns(it => it.Bld011 == 1)
                    .Where(it => it.Id == blDetail1.Id)
                    .ExecuteCommand();
            }

            // 更新库存数量为0
            db.Updateable<MesInvItemStocks>()
@@ -386,7 +380,6 @@
                .First();

            if (unfinishedDetail == null)
            {
                // 如果没有未完成的明细，更新补料单状态为已完成
                db.Updateable<MesItemBl>()
                    .SetColumns(it => new MesItemBl
@@ -397,7 +390,6 @@
                    })
                    .Where(it => it.Id == mesItemBl.Id)
                    .ExecuteCommand();
            }

            return 1;
        });
@@ -471,7 +463,7 @@

        if (stockBarcode == null)
            throw new Exception($"库存中无此条码,请核对！{query.barcode}");
        

        var totalQty = stockBarcode.Quantity;
        string newBarcode = null;

@@ -527,7 +519,7 @@
                    // Memo = stockBarcode.Memo,
                    SuppNo = stockBarcode.SuppNo,
                    // InsDate = stockBarcode.InsDate, // Added InsDate
                    ItemId = stockBarcode.ItemId,
                    ItemId = stockBarcode.ItemId
                    // ItemUnit = stockBarcode.ItemUnit // Added ItemUnit
                }).IgnoreColumns(true).ExecuteCommand();

@@ -567,7 +559,7 @@
                    WorkNo = stockBarcode.WorkNo,
                    WorkLine = stockBarcode.WorkLine,
                    SuppNo = stockBarcode.SuppNo,
                    ItemId = stockBarcode.ItemId,
                    ItemId = stockBarcode.ItemId
                    // UnitId = stockBarcode.ItemUnit
                }).IgnoreColumns(true).ExecuteCommand();

@@ -601,7 +593,7 @@
                    WorkLine = stockBarcode.WorkLine,
                    SuppNo = stockBarcode.SuppNo,
                    SuppId = stockBarcode.SuppId,
                    ItemId = stockBarcode.ItemId,
                    ItemId = stockBarcode.ItemId
                    // CkDepot = stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
            }
@@ -611,7 +603,7 @@
            }

            if (string.IsNullOrEmpty(newBarcode)) newBarcode = query.barcode;
            

            // 检查补料单状态
            var mesItemBl = Db.Queryable<MesItemBl>()
                .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
@@ -652,7 +644,8 @@
                throw new Exception($"工单 {query.billNo} 不存在，请确认！");

            var womdab = Db.Queryable<Womdab>()
                .Where(b => b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014)
                .Where(b =>
                    b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014)
                .First();

            if (womdab == null)
@@ -660,13 +653,13 @@

            // 检查已发料数量是否超过待发料数量
            var sumQty = db.Queryable<MesInvItemOutCDetails>()
                .Where(it => it.TaskNo == query.blNo && it.ItemId == stockBarcode.ItemId)
                .Where(it =>
                    it.TaskNo == query.blNo && it.ItemId == stockBarcode.ItemId)
                .Sum(it => it.Quantity);

            if (sumQty > remainingQty)
            {
                throw new Exception($"拆分数量：{sumQty} 大于待发料数量：{remainingQty}，请核对！");
            }
                throw new Exception(
                    $"拆分数量：{sumQty} 大于待发料数量：{remainingQty}，请核对！");

            // 获取或创建出库单
            var itemOut = db.Queryable<MesInvItemOuts>()
@@ -720,7 +713,6 @@
                .Count();

            if (itemOutItemCount == 0)
            {
                // 插入新的出库单明细
                executeCommand += db.Insertable(new MesInvItemOutItems
                {
@@ -742,13 +734,11 @@
                    ErpId = womdab.Eid,
                    ErpAutoid = womdab.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012,
                    ItemId = blDetail.Bld012
                    // Unit = blDetail.Bld009,
                    // DepotId = (int)stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
            }
            else
            {
                // 更新已有出库单明细数量
                executeCommand += db.Updateable<MesInvItemOutItems>()
                    .SetColumns(it => it.Quantity == it.Quantity + query.Num)
@@ -756,7 +746,6 @@
                        it.ItemOutId == itemOut.Guid &&
                        it.ItemId == stockBarcode.ItemId)
                    .ExecuteCommand();
            }

            // 插入出库条码明细
            executeCommand += db.Insertable(new MesInvItemOutCDetails
@@ -816,7 +805,7 @@
                WorkNo = blDetail.Bld001,
                WorkLine = blDetail.Bld013,
                SuppNo = stockBarcode.SuppNo,
                ItemId = stockBarcode.ItemId,
                ItemId = stockBarcode.ItemId
                // CkDepot = stockBarcode.DepotsId
            }).IgnoreColumns(true).ExecuteCommand();

@@ -848,13 +837,11 @@
                .First();

            if ((updatedDetail.Bld007 ?? 0) <= (updatedDetail.Bld008 ?? 0))
            {
                // 更新明细完成状态
                executeCommand += db.Updateable<MesItemBlDetail>()
                    .SetColumns(it => new MesItemBlDetail { Bld011 = 1 })
                    .Where(it => it.Id == blDetail.Id)
                    .ExecuteCommand();
            }

            // 检查是否还有未完成的明细

@@ -863,7 +850,6 @@
                .First();

            if (unfinishedDetail == null)
            {
                // 如果没有找到未完成明细，则更新补料单状态为已完成
                executeCommand += db.Updateable<MesItemBl>()
                    .SetColumns(it => new MesItemBl
@@ -874,8 +860,7 @@
                    })
                    .Where(it => it.Id == mesItemBl.Id)
                    .ExecuteCommand();
            }
            

            if (executeCommand <= 1) throw new Exception("更新失败");

            return executeCommand;
@@ -1103,7 +1088,7 @@
        UseTransaction(db =>
        {
            // 生成或获取出库单
            Guid outId = Guid.Empty;
            var outId = Guid.Empty;
            var outNo = "";
            var outRecord = db.Queryable<MesInvItemOuts>()
                .Where(a => a.BbillNo == query.blNo
@@ -1157,7 +1142,6 @@
                .First();

            if (outItem == null)
            {
                // 插入出库单明细
                db.Insertable(new MesInvItemOutItems
                {
@@ -1177,13 +1161,11 @@
                    ErpId = womdab.Eid,
                    ErpAutoid = womdab.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012,
                    ItemId = blDetail.Bld012
                    // Unit = blDetail.Bld009,
                    // DepotId = stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
            }
            else
            {
                // 更新出库单明细数量
                db.Updateable<MesInvItemOutItems>()
                    .SetColumns(it => new MesInvItemOutItems
@@ -1194,7 +1176,6 @@
                        it.ItemOutId == outId &&
                        it.ItemId == stockBarcode.ItemId)
                    .ExecuteCommand();
            }

            // 插入出库条码明细
            db.Insertable(new MesInvItemOutCDetails
@@ -1247,7 +1228,7 @@
                WorkLine = blDetail.Bld013,
                SuppNo = stockBarcode.SuppNo,
                SuppId = stockBarcode.SuppId,
                ItemId = stockBarcode.ItemId,
                ItemId = stockBarcode.ItemId
                // CkDepot = stockBarcode.DepotsId
            }).IgnoreColumns(true).ExecuteCommand();

@@ -1287,12 +1268,10 @@

            // 如果所有明细完成,更新超领单状态为已完成
            if (!hasUnfinished)
            {
                db.Updateable<MesItemBl>()
                    .SetColumns(it => it.Bl019 == true)
                    .Where(it => it.Id == mesItemBl.Id)
                    .ExecuteCommand();
            }

            return 1;
        });
@@ -1317,7 +1296,7 @@
    }

    /// <summary>
    /// 生产超领打印条码
    ///     生产超领打印条码
    /// </summary>
    /// <param name="query">查询参数</param>
    /// <returns>处理结果</returns>
@@ -1560,7 +1539,6 @@
                .Count();

            if (itemOutItemCount == 0)
            {
                // 插入新的出库单明细
                db.Insertable(new MesInvItemOutItems
                {
@@ -1582,13 +1560,11 @@
                    ErpId = workOrderDetail.Eid,
                    ErpAutoid = workOrderDetail.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012,
                    ItemId = blDetail.Bld012
                    // Unit = blDetail.Bld009,
                    // DepotId = stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
            }
            else
            {
                // 更新已有出库单明细数量
                db.Updateable<MesInvItemOutItems>()
                    .SetColumns(it => it.Quantity == it.Quantity + query.Num)
@@ -1596,7 +1572,6 @@
                        it.ItemOutId == itemOut.Guid &&
                        it.ItemId == stockBarcode.ItemId)
                    .ExecuteCommand();
            }

            // 插入出库明细记录
            db.Insertable(new MesInvItemOutCDetails
@@ -1685,13 +1660,11 @@
                .First();

            if ((blDetail1.Bld007 ?? 0) <= (blDetail1.Bld008 ?? 0))
            {
                // 更新明细完成状态
                db.Updateable<MesItemBlDetail>()
                    .SetColumns(it => it.Bld011 == 1)
                    .Where(it => it.Id == blDetail1.Id)
                    .ExecuteCommand();
            }

            // 检查是否所有明细都已完成
            var hasUnfinished = db.Queryable<MesItemBlDetail>()
@@ -1700,12 +1673,10 @@

            // 如果所有明细完成,更新补料单状态为已完成
            if (!hasUnfinished)
            {
                db.Updateable<MesItemBl>()
                    .SetColumns(it => it.Bl019 == true)
                    .Where(it => it.Id == mesItemBl.Id)
                    .ExecuteCommand();
            }

            return 1;
        });