Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

cnf

2025-05-09 af3455bc13c0ed48f4e3fa1b1614f601df24f12c

 StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs

@@ -44,6 +44,7 @@
                case "2":
                case "4":
                case "5":
            
                    if (InsertOrUpdate(db, entity))
                        return 1;
                    break;
@@ -86,6 +87,7 @@
                    case "2":
                    case "4":
                    case "5":
                
                        if (!InsertOrUpdateBatch(db, itemGroup.Value))
                            throw new NotImplementedException("同步失败");
                        break;
@@ -174,6 +176,8 @@
            ExpPeriod = item.FExpPeriod,
            //ColorName = item.FColor,
            CreateDate = DateTime.Now,
            Type=item.Type,
            //20250412 是否根据工厂不同修改不同编码
            Company = "1000",
            Factory = "1000",
            /// <summary>
@@ -196,7 +200,28 @@
            FISKITTING = item.FIsKitting,
            FISCOBY = item.FIsCoby,
            FOVERCONTROLMODE = item.FOverControlMode,
            F_MJBH = item.F_MJBH
            F_MJBH = item.F_MJBH,
//20250407 yhj 焕媄新增字段
             F_TJ       =item.F_TJ,
             F_KZ      =item.F_KZ,
             F_SC      =item.F_SC,
             F_HSFX     =item.F_HSFX,
             F_KCKZ     =item.F_KCKZ,
             F_XSKZ     =item.F_XSKZ,
             F_CRM     =item.F_CRM,
             F_CGKZ     =item.F_CGKZ,
             F_WWLX     =item.F_WWLX,
             F_JYSZ     =item.F_JYSZ,
             F_FJZQ     =item.F_FJZQ,
             F_SCLX     =item.F_SCLX,
             F_ZZSTLX     =item.F_ZZSTLX,
             F_DCSL     =item.F_DCSL,
            F_BZGS     =item.F_BZGS,
            WLFZMC=item.F_FZMC,
            MJBM =item.MJBM,
            KHWLBM =item.KHWLBM,
            YS=item.YS,
            Next_Gx = item.NEXT_GX,
        };
    }