快乐的昕的电脑
2025-12-01 8467a224aaac3dfe516fb72a2eaf7e443311a910
MES.Service/service/BasicData/MesRohInManager.cs
@@ -4,6 +4,7 @@
using MES.Service.Modes;
using SqlSugar;
using System.Globalization;
using System.Security.AccessControl;
namespace MES.Service.service.BasicData;
@@ -19,6 +20,11 @@
        var mesRohInDatas =
            GetMesRohInDatas(rohIn.ErpRohinDatas);
        //1    | 未实现     | 抛出异常
        //2    | 审核       | 调用 SaveOrUpdateData,正常插入/更新
        //3    | 反审核     | 调用 SaveOrUpdateData,BillNo 一定加后缀
        //4    | 手工同步   | 调用 SaveOrUpdateData,正常插入/更新
        //5    | 未注释     | 调用 SaveOrUpdateData,正常插入/更新
        return UseTransaction(db =>
        {
            return rohInErpRohIn.Type switch
@@ -159,9 +165,20 @@
        mesRohIn.Anred = rohIn.FTContact;
        mesRohIn.Telf1 = rohIn.Fmobilephone;
        mesRohIn.FixedTelephone = rohIn.FixedTelephone;
        mesRohIn.Address = rohIn.Address;
        mesRohIn.Acctype = rohIn.Acctype;
        mesRohIn.Address = rohIn.FProviderAddress;//供货方地址
        mesRohIn.SynchronousDate = DateTime.Now;
        mesRohIn.Remark2= rohIn.F_UNW_GYSLXR;// 供应商联系人
        mesRohIn.Remark3= rohIn.F_UNW_LXRDH;// 联系人电话
        mesRohIn.Remark4 = rohIn.FProviderJob;// 职务
        mesRohIn.Remark5 = rohIn.FProviderPhone;// 手机
        mesRohIn.QtyAcceptance = rohIn.FACCTYPE;//验收方式
        mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq;//质量要求
        mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs;//运输方式
        mesRohIn.Remarks = rohIn.F_UNW_BZ;//备注
        mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;//治具丶模具加工及采购
        mesRohIn.urgent_material = rohIn.FUrgent_Material;//急料
        return mesRohIn;
    }
@@ -204,21 +221,21 @@
                BusinessClose = s.FMRPCloseStatus,
                BusinessFreeze = s.FMRPFreezeStatus,
                Freezer = s.FFreezerId,
                //FreezeTime = !string.IsNullOrEmpty(s.FFreezeDate)
                //            && DateTime.TryParseExact(s.FFreezeDate,
                //                new[] { "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd" },  // 支持多种格式
                //                CultureInfo.InvariantCulture,
                //                DateTimeStyles.None,
                //                out var parsedDate)
                //            && parsedDate > new DateTime(1900, 1, 1)
                //                ? parsedDate
                //                : (DateTime?)null,
                FreezeTime = !string.IsNullOrEmpty(s.FFreezeDate)
                            && DateTime.TryParseExact(s.FFreezeDate,
                                new[] { "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd" },  // 支持多种格式
                                CultureInfo.InvariantCulture,
                                DateTimeStyles.None,
                                out var parsedDate)
                            && parsedDate > new DateTime(1900, 1, 1)
                                ? parsedDate
                                : (DateTime?)null,
                BusinessTerminate = s.FMRPTerminateStatus,
                Terminator = s.FTerminaterId,
                //TerminateTime = s.FTerminateDate != null
                //    ? DateTime.ParseExact(s.FTerminateDate,
                //        "yyyy-MM-dd HH:mm:ss", null)
                //    : null,
                TerminateTime = s.FTerminateDate != null
                    ? DateTime.ParseExact(s.FTerminateDate,
                        "yyyy-MM-dd HH:mm:ss", null)
                    : null,
                TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty), //累计收料数
                RemainingReceivedQty =
                    Convert.ToDecimal(s.FRemainReceiveQty),
@@ -228,7 +245,7 @@
                ReturnableReceivedQty =
                    Convert.ToDecimal(s.FCHECKRETQTY), //收料可退数
                ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), //库存可退数
                SourceDocumentType = s.FSrcBillTypeId,
                SourceDocumentType = s.FBillTypeID,//采购单别
                SourceDocumentId = s.FSrcBillNo,
                DemandTrackingId = s.FReqTraceNo,
                PlanTrackingId = s.FMtoNo,
@@ -244,7 +261,10 @@
                Receiving = s.FReceiveOrgId,
                Settlement = s.FSETTLEORGID,
                DemandDepartment = s.FRequireDeptId,
                ReceivingDepartment = s.FReceiveDeptId
                ReceivingDepartment = s.FReceiveDeptId,
                Remark5 = s.FUrgent_Material, //急料
                SalesOrderId = s.F_UNW_Text_xsddh
            };
            if (s.FFreezeDate != null)