Merge remote-tracking branch 'origin/master'

啊鑫

6 天以前 79e43ccffd15afcd99934ee43b706f6133398079

 MES.Service/service/BasicData/MesCustomerManager.cs

@@ -120,12 +120,10 @@

    private MesCustomer GetSysDepartment(ErpCustomer customer)
    {

        //ERP傳輸的接口數據轉換為MES數據庫字段

        return new MesCustomer
        {
            Id = Convert.ToDecimal(customer.Id),
            Type = customer.Type,
            CustNo = customer.FNumber,
            CustSname = customer.FShortName,
            CustName = customer.FName,
@@ -133,9 +131,6 @@
            Telf1 = customer.Fmobilephone,
            Fseller = customer.Fseller,
            Fforbidstatus = customer.FForbidStatus,
            fremarks             =customer.Fremarks,
            FSubsidiary          =customer.FSubsidiary,
            Fumbrella = customer.Fumbrella,
            Company = "1000",
            Factory = "1000"
        };