1.条码表实体类型调整 2.条码库存表实体新增基础字段 3.期初入库新增入库人

南骏 池

2025-02-13 eda0c8f74ce453b6e43f88fc92b1e651ce5b6095

 service/Warehouse/MesItemBlManager.cs

@@ -94,7 +94,7 @@
            throw new Exception("用户名不能为空！");

        if (string.IsNullOrEmpty(query.blNo))
            throw new Exception("补料单号不能为空！");
            throw new Exception("申请单号不能为空！");


        // 检验是否重复扫描
@@ -185,9 +185,17 @@
        // 开启事务处理
        var success = UseTransaction(db =>
        {
            var outNoType = "";
            if(query.Type == "生产补料")
            {
                outNoType = "BL(工单补料)";
            }else 
            {
                outNoType = "CL(工单超领)";
            }
            // 获取或创建出库单
            var outId = Guid.NewGuid();
            var outNo = BillNo.GetBillNo("BL(工单补料)");
            var outNo = BillNo.GetBillNo(outNoType);

            var existingOut = db.Queryable<MesInvItemOuts>()
                .Where(a => a.BbillNo == query.blNo
@@ -221,6 +229,7 @@
                    Remark = mesItemBl.Bl007,
                    DepotCode = womdab.Dab017,
                    OutPart = womdaa.Daa013,
                    OutType = query.Type,
                    FType = 0,
                    Factory = stockBarcode.Factory,
                    Company = stockBarcode.Company,
@@ -229,23 +238,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 && i.DepotId == stockBarcode.DepotsId.ToString())
                .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 && i.DepotId == stockBarcode.DepotsId.ToString())
                    .ExecuteCommand();
            else
                // 插入新的物料明细记录
@@ -255,6 +264,7 @@
                    ItemOutId = outId,
                    ItemNo = blDetail.Bld002,
                    Quantity = stockBarcode.Quantity,
                    TlQty = stockBarcode.Quantity,
                    CreateBy = query.userName,
                    CreateDate = DateTime.Now,
                    LastupdateBy = query.userName,
@@ -269,7 +279,8 @@
                    ErpId = womdab.Eid,
                    ErpAutoid = womdab.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012
                    ItemId = blDetail.Bld012,
                    DepotId = stockBarcode.DepotsId.ToString(),
                    // Unit = blDetail.Bld009,
                    // DepotId = (int)stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();