kyy
2025-08-22 43010e679768b1afc58c6acddeac9a92fc290ffb
1、采购退货修改
已修改2个文件
32 ■■■■ 文件已修改
MES.Service/Modes/MesCgthSqDetail.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/MesCgthSqManager.cs 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesCgthSqDetail.cs
@@ -133,4 +133,5 @@
    /// </summary>
    [SugarColumn(ColumnName = "FMtoNo")]
    public string? FMtoNo { get; set; }
}
MES.Service/service/BasicData/MesCgthSqManager.cs
@@ -164,9 +164,22 @@
            FSupplierId = erpMain.FSupplierID,
            FBillTypeId = erpMain.FBillTypeID,
            FBusinessType = erpMain.FBusinessType,
            ReturnType = erpMain.FMRTYPE,
            ReturnMethod = erpMain.FMRMODE,
        // 转换ReturnType: A->检验退料, B->库存退料
        ReturnType = erpMain.FMRTYPE switch
        {
            "A" => "检验退料",
            "B" => "库存退料",
            _ => erpMain.FMRTYPE // 保持原值不变
        },
        // 转换ReturnMethod: A->退料补料, B->退料扣款
        ReturnMethod = erpMain.FMRMODE switch
        {
            "A" => "退料补料",
            "B" => "退料并扣款",
            _ => erpMain.FMRMODE // 保持原值不变
        },
            CreateBy = erpMain.FCreatorId,
        LastUpdateUser = erpMain.FCreatorId,
            FPurchaseOrgId = erpMain.FPurchaseOrgId,
            ThOrgId = erpMain.FStockOrgId,
            FRequireOrgId = erpMain.FRequireOrgId,
@@ -176,16 +189,23 @@
            FMRReason = erpMain.FMRREASON,
            FPurchaseDeptId = erpMain.FPURCHASEDEPTID,
            FPurchaserGroupId = erpMain.FPURCHASERGROUPID,
            FACCTYPE = erpMain.FACCTYPE,
        // 转换FACCTYPE: Q->数量验收, A->金额验收, R->比例验收
        FACCTYPE = erpMain.FACCTYPE switch
        {
            "Q" => "Q:数量验收",
            "A" => "A:金额验收",
            "R" => "R:比例验收",
            _ => erpMain.FACCTYPE // 保持原值不变
        },
            FCreateDate = erpMain.FCreateDate,
            FWPVTINTEGERL6W = erpMain.F_WPVT_INTEGER_L6W,
        FWPVTINTEGERL6W = 0,
            // 供应商ID(安全转换)
            SuppId = !string.IsNullOrEmpty(erpMain.FSupplierID)
                     && int.TryParse(erpMain.FSupplierID, out int suppId)
                ? suppId
                : null,
        Status = false,
            // 系统字段(创建时间仅新增时赋值,更新时不覆盖)
            CreateDate = DateTime.Now,
            LastUpdateTime = DateTime.Now
@@ -214,6 +234,7 @@
                : null,
            FsrcBillNo = erpDetail.FSRCBillNo,
            InvBillNo = erpDetail.FSRCBillNo,
            FsrcBillTypeId = erpDetail.FSRCBillTypeId,
            // 物料ID(安全转换)