1.生产补料初步完成（拆分补料还未完成） 2.出库物料明细实体类调整

南骏 池

2025-02-10 62750a4a726896b803fa0f7b1862c19f7bd04f4c

 service/Warehouse/MesItemBlManager.cs

@@ -68,6 +68,7 @@
    }

    /// <summary>
    /// 生产工单补料扫码
    ///     扫描条码  prc_rf_pda_scan_zout_barcode3
    /// </summary>
    /// <param name="query">查询参数</param>
@@ -80,7 +81,7 @@
    ///     - blNo: 补料单号(必填)
    /// </remarks>
    public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
        SctlScanBarcode(
        ScblScanBarcode(
            WarehouseQuery query)
    {
        if (string.IsNullOrEmpty(query.billNo))
@@ -114,7 +115,7 @@

        // 检查补料单状态
        var mesItemBl = Db.Queryable<MesItemBl>()
            .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
            .Where(a => a.BlNo == query.blNo)
            .First();

        if (mesItemBl == null)
@@ -220,6 +221,7 @@
                    Remark = mesItemBl.Bl007,
                    DepotCode = womdab.Dab017,
                    OutPart = womdaa.Daa013,
                    OutType = "生产补料",
                    FType = 0,
                    Factory = stockBarcode.Factory,
                    Company = stockBarcode.Company,
@@ -228,23 +230,23 @@
                    PbillNo = womdaa.Daa001,
                    OutDate = DateTime.Now,
                    Status = 0,
                    BbillNo = query.blNo
                    BbillNo = query.billNo
                }).IgnoreColumns(true).ExecuteCommand();
            }

            // 检查并更新出库单物料明细
            var itemCount = db.Queryable<MesInvItemOutItems>()
                .Where(i =>
                    i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
                    i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId)
                .Count();

            if (itemCount > 0)
                // 更新已存在的物料明细数量
                db.Updateable<MesInvItemOutItems>()
                    .SetColumns(i =>
                        i.Quantity == i.Quantity + stockBarcode.Quantity)
                        i.TlQty == i.TlQty + stockBarcode.Quantity)
                    .Where(i =>
                        i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
                        i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId)
                    .ExecuteCommand();
            else
                // 插入新的物料明细记录
@@ -254,6 +256,7 @@
                    ItemOutId = outId,
                    ItemNo = blDetail.Bld002,
                    Quantity = stockBarcode.Quantity,
                    TlQty = stockBarcode.Quantity,
                    CreateBy = query.userName,
                    CreateDate = DateTime.Now,
                    LastupdateBy = query.userName,