南骏 池
2025-03-12 f862d5003ac180b79cd14478fd17dba1b4b28a82
1.采购入库优化
2.生产领料优化
3.生产不补料优化
已修改6个文件
62 ■■■■ 文件已修改
entity/Womdaa.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
entity/Womdab.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/Warehouse/MesInvItemInCDetailsManager.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/Warehouse/MesItemBlManager.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/Warehouse/MesXsckManager.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/Wom/WomdaaManager.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
entity/Womdaa.cs
@@ -23,17 +23,17 @@
    [SugarColumn(ColumnName = "caaGuid")]
    public Guid? CaaGuid { get; set; }
    /// <summary>
    ///     自增列
    /// </summary>
    [SugarColumn(ColumnName = "id")]
    public int? Id { get; set; }
    ///// <summary>
    /////     自增列
    ///// </summary>
    //[SugarColumn(ColumnName = "id")]
    //public int? Id { get; set; }
    /// <summary>
    ///     排产ID
    /// </summary>
    [SugarColumn(ColumnName = "pid")]
    public int? Pid { get; set; }
    ///// <summary>
    /////     排产ID
    ///// </summary>
    //[SugarColumn(ColumnName = "pid")]
    //public int? Pid { get; set; }
    /// <summary>
    ///     单号
entity/Womdab.cs
@@ -18,17 +18,17 @@
    [SugarColumn(ColumnName = "daaGuid")]
    public Guid? DaaGuid { get; set; }
    /// <summary>
    ///     自增列
    /// </summary>
    [SugarColumn(ColumnName = "id")]
    public int? Id { get; set; }
    ///// <summary>
    /////     自增列
    ///// </summary>
    //[SugarColumn(ColumnName = "id")]
    //public int? Id { get; set; }
    /// <summary>
    ///     PID
    /// </summary>
    [SugarColumn(ColumnName = "pid")]
    public int? Pid { get; set; }
    ///// <summary>
    /////     PID
    ///// </summary>
    //[SugarColumn(ColumnName = "pid")]
    //public int? Pid { get; set; }
    /// <summary>
    ///     工单单号
service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -293,7 +293,8 @@
                                Remark = itemBarcodeDetails.Memo,
                                EbelnK3id = detail.EbelnK3id,
                                LineK3id = detail.LineK3id,
                                DepotId = depotCode2
                                DepotId = depotCode2,
                                itemDabid = itemBarcodeDetails.AboutGuid.ToString()
                            }).IgnoreColumns(true).ExecuteCommand();
                        else
                            db.Updateable<MesInvItemInCItems>()
@@ -515,7 +516,8 @@
                        EbelnK3id = itemBarcodeDetails.EbelnK3id,
                        LineK3id = itemBarcodeDetails.LineK3id,
                        ItemId = itemBarcodeDetails.ItemId,
                        DepotId = depotCode2
                        DepotId = depotCode2,
                        itemDabid = itemBarcodeDetails.AboutGuid.ToString()
                    }).IgnoreColumns(true).ExecuteCommand();
                else
                    // 存在时更新数量
service/Warehouse/MesItemBlManager.cs
@@ -375,7 +375,7 @@
                    Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
                    Dab021 = (it.Dab021 ?? 0) + stockBarcode.Quantity
                })
                .Where(it => it.Id == womdab.Id && it.Dab003 == womdab.Dab003)
                .Where(it => it.Guid == womdab.DaaGuid && it.Dab003 == womdab.Dab003)
                .ExecuteCommand();
            // 更新补料单明细已补数量
@@ -887,7 +887,7 @@
                    Dab020 = (it.Dab020 ?? 0) + query.Num, // 已发料数量
                    Dab021 = (it.Dab021 ?? 0) + query.Num // 已发料数量
                })
                .Where(it => it.Id == womdab.Id && it.Dab003 == womdab.Dab003)
                .Where(it => it.Guid == womdab.DaaGuid && it.Dab003 == womdab.Dab003)
                .ExecuteCommand();
            // 更新补料单明细已补数量
@@ -1316,7 +1316,7 @@
                    Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
                    Dab023 = (it.Dab023 ?? 0) + stockBarcode.Quantity
                })
                .Where(it => it.Id == womdab.Id)
                .Where(it => it.Guid == womdab.Guid)
                .ExecuteCommand();
            // 更新超领单明细
@@ -1720,7 +1720,7 @@
                    Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
                    Dab023 = (it.Dab023 ?? 0) + stockBarcode.Quantity
                })
                .Where(it => it.Id == workOrderDetail.Id)
                .Where(it => it.Guid == workOrderDetail.Guid)
                .ExecuteCommand();
            // 更新补料单明细已补数量
service/Warehouse/MesXsckManager.cs
@@ -590,7 +590,7 @@
                    Dab020 = (it.Dab020 ?? 0) + query.Num, // 已发料数量
                    Dab021 = (it.Dab021 ?? 0) + query.Num // 已发料数量
                })
                .Where(it => it.Id == womdab.Id && it.Dab003 == womdab.Dab003)
                .Where(it => it.Guid == womdab.Guid && it.Dab003 == womdab.Dab003)
                .ExecuteCommand();
            // 更新发货通知单明细已补数量
service/Wom/WomdaaManager.cs
@@ -17,9 +17,9 @@
    public List<string> GetProductionPickDaa001(WarehouseQuery query)
    {
        var sql =
            "SELECT DAA001 FROM WOMDAA A LEFT JOIN (SELECT COUNT(1) UN_NUM, PID                     FROM WOMDAB                    WHERE DAB006 > DAB007                   GROUP BY PID) B ON A.ID = B.PID WHERE DAA001 LIKE '%" +
            "SELECT DAA001 FROM WOMDAA A LEFT JOIN (SELECT COUNT(1) UN_NUM, PID FROM WOMDAB  WHERE DAB006 > DAB007 GROUP BY DAB002) B ON A.GUID = B.daaGuid WHERE DAA001 = " +
            query.daa001 +
            "%' and DAA018 != '完工' AND DAA022 = 1 AND UN_NUM > 0 AND ROWNUM <= 10 order by a.id desc";
            " and DAA018 != '完工' AND DAA022 = 1 AND UN_NUM > 0 AND ROWNUM <= 10 order by a.id desc";
        return Db.Ado.SqlQuery<string>(sql);
    }
@@ -186,7 +186,7 @@
                a.Daa001 == query.daa001 && d.IssueType == "1")
            .Select((a, b, c, d) => new Womdab
            {
                Pid = b.Pid,
                //Pid = b.Pid,
                Dab003 = b.Dab003,
                Dab006 = b.Dab006,
                Dab007 = b.Dab007,