mneq

apiserver/service/job.go

@@ -24,31 +24,31 @@ func SapJobInit() {
 	})
 	//c.Start()
 
-	//t := time.Now()
-	//i := 60
-	//pastureList := make([]*model.Pasture, 0)
-	//s.d.DB.Table("pasture").Where("id in(1768,1769,1770,1771,1772)").Find(&pastureList)
-	//
-	//for {
-	//	//for _, pasture := range pastureList {
-	//	s.SapAsset(t.AddDate(0, 0, -i), "", "1020")
-	//	//}
-	//
-	//	if i == 0 {
-	//		panic("break")
-	//	}
-	//	i--
-	//}
-	var t time.Time
-	t = time.Now()
-	s.SapMaterial(t.AddDate(0, 0, -1), "")
-	s.SapMaterial(t.AddDate(0, 0, -2), "")
-	s.SapMaterial(t.AddDate(0, 0, -3), "")
-	s.SapMaterial(t.AddDate(0, 0, -4), "")
-	s.SapMaterial(t.AddDate(0, 0, -5), "")
-	s.SapMaterial(t.AddDate(0, 0, -6), "")
-	s.SapMaterial(t.AddDate(0, 0, -7), "")
-	s.SapMaterial(t.AddDate(0, 0, -8), "")
+	t := time.Now()
+	i := 20
+	pastureList := make([]*model.Pasture, 0)
+	s.d.DB.Table("pasture").Find(&pastureList)
+
+	for {
+		for _, pasture := range pastureList {
+			s.SapAsset(t.AddDate(0, 0, -i), "", pasture.CompanyCode)
+		}
+
+		if i == 0 {
+			panic("break")
+		}
+		i--
+	}
+	//var t time.Time
+	//t = time.Now()
+	//s.SapMaterial(t.AddDate(0, 0, -1), "")
+	//s.SapMaterial(t.AddDate(0, 0, -2), "")
+	//s.SapMaterial(t.AddDate(0, 0, -3), "")
+	//s.SapMaterial(t.AddDate(0, 0, -4), "")
+	//s.SapMaterial(t.AddDate(0, 0, -5), "")
+	//s.SapMaterial(t.AddDate(0, 0, -6), "")
+	//s.SapMaterial(t.AddDate(0, 0, -7), "")
+	//s.SapMaterial(t.AddDate(0, 0, -8), "")
 	//s.SapMaterial(t.AddDate(0, 0, -9), "")
 	//s.SapMaterial(t.AddDate(0, 0, -10), "")
 	//s.SapMaterial(t.AddDate(0, 0, -11), "")

apiserver/service/material.go

@@ -378,6 +378,7 @@ func EquipmentExec(rows [][]string, pastureId int) error {
 		//purchaseDate := v[10]
 		//entranceDate, _ := ExcelIntDate(v[11])
 		//entranceDate := v[11]
+		assetCode := v[2]
 		depreciation := v[12]
 		yuanzhi := v[14]
 		salvage := v[15]
@@ -458,22 +459,36 @@ func EquipmentExec(rows [][]string, pastureId int) error {
 			fmt.Println(err)
 			return err
 		}
-		if pastureId != pasture.ID {
-			continue
-		}
+		//if pastureId != pasture.ID {
+		//	continue
+		//}
 
-		err = s.d.DB.Exec(` update equipment set  eqCode = if(? = '',null,?),specification = ?,purpose = ?	
-        ,depreciation=?,
-         yuanzhi=?, salvage =?,subtractvalue =?, upkeepgrade= ?,yearUpkeepCost=? ,yearMaintainCost=?,baseHours=?,employeName=(select empname from emp  where replace(empname,' ','') = ? and pastureId = ? and enable = 1 ),
-         employeeId = (select id from emp  where replace(empname,' ','') = ? and pastureId = ? and enable = 1 ),inputUser=?,leaveDate=? ,
-         brand = ?, brandId = ? ,proId= ?,proName= ? ,eqClassName = ?,eqClassId = (select id from eqclass where typeName = ?),eqName = ?,
-         	maintenance= (select GROUP_CONCAT(id) from emp where  FIND_IN_SET(replace(empname,' ',''),replace(?,' ',''))     and pastureId = ? and enable = 1  ),levelone=(select id from emp where  replace(empname,' ','') =  replace(?,' ','')    and pastureId = ? and enable = 1 ) ,
-		leveltwo = (select id from emp where  replace(empname,' ','') =  replace(?,' ','')   and pastureId = ? and enable = 1 ),levelthree=(select id from emp where replace(empname,' ','')  =  replace(?,' ','')    and pastureId = ? and enable = 1 )
-		,leveloneTime = ? ,leveltwoTime = ?,levelthreeTime= ? ,pushStatus = 2 where financeCode = ? `,
-			eqCode, eqCode, specification, purpose, depreciation, yuanzhi,
+		err = s.d.DB.Exec(` insert into equipment (assetCode,pastureId,pastureName,eqCode,specification,purpose,depreciation,yuanzhi, salvage,subtractvalue, upkeepgrade,yearUpkeepCost,
+                        yearMaintainCost,baseHours,employeName,employeeId,inputUser,leaveDate,brand,brandId,proId,proName,eqClassName,eqClassId,eqName,
+                        maintenance,levelone,leveltwo,levelthree,leveloneTime,leveltwoTime,levelthreeTime)
+ values(?,?,?,if(? = '',null,?),?,?,?,?,?,?,?,?,?,?,(select empname from emp  where replace(empname,' ','') = ? and pastureId = ? and enable = 1 ),
+        (select id from emp  where replace(empname,' ','') = ? and pastureId = ? and enable = 1 ),?,?,?,?,?,?,?,
+        (select id from eqclass where typeName = ?),?,(select GROUP_CONCAT(id) from emp where  FIND_IN_SET(replace(empname,' ',''),replace(?,' ',''))    
+         and pastureId = ? and enable = 1  ),
+        (select id from emp where  replace(empname,' ','') =  replace(?,' ','')    and pastureId = ? and enable = 1 ), 
+        (select id from emp where  replace(empname,' ','') =  replace(?,' ','')   and pastureId = ? and enable = 1 ),
+        (select id from emp where replace(empname,' ','')  =  replace(?,' ','')    and pastureId = ? and enable = 1 ),?,?,?)  ON DUPLICATE KEY UPDATE assetCode = ?`,
+			assetCode, pasture.ID, pasture.Name, eqCode, eqCode, specification, purpose, depreciation, yuanzhi,
 			salvage, subtractvalue, upkeepgrade, yearUpkeepCost, yearMaintainCost, baseHours, employeName, pasture.ID, employeName, pasture.ID, inputUser, leaveDate,
 			brandInfo.BrandName, brandInfo.ID, provider.ID, provider.ProviderName, eqName, v[1], v[3], maintenance, pasture.ID, levelone, pasture.ID,
-			leveltwo, pasture.ID, levelthree, pasture.ID, onepushTime, twopushTime, threepushTime, financeCode).Error
+			leveltwo, pasture.ID, levelthree, pasture.ID, onepushTime, twopushTime, threepushTime, assetCode).Error
+		//err = s.d.DB.Exec(` update equipment set  eqCode = if(? = '',null,?),specification = ?,purpose = ?
+		//,depreciation=?,
+		// yuanzhi=?, salvage =?,subtractvalue =?, upkeepgrade= ?,yearUpkeepCost=? ,yearMaintainCost=?,baseHours=?,employeName=(select empname from emp  where replace(empname,' ','') = ? and pastureId = ? and enable = 1 ),
+		// employeeId = (select id from emp  where replace(empname,' ','') = ? and pastureId = ? and enable = 1 ),inputUser=?,leaveDate=? ,
+		// brand = ?, brandId = ? ,proId= ?,proName= ? ,eqClassName = ?,eqClassId = (select id from eqclass where typeName = ?),eqName = ?,
+		// 	maintenance= (select GROUP_CONCAT(id) from emp where  FIND_IN_SET(replace(empname,' ',''),replace(?,' ',''))     and pastureId = ? and enable = 1  ),levelone=(select id from emp where  replace(empname,' ','') =  replace(?,' ','')    and pastureId = ? and enable = 1 ) ,
+		//leveltwo = (select id from emp where  replace(empname,' ','') =  replace(?,' ','')   and pastureId = ? and enable = 1 ),levelthree=(select id from emp where replace(empname,' ','')  =  replace(?,' ','')    and pastureId = ? and enable = 1 )
+		//,leveloneTime = ? ,leveltwoTime = ?,levelthreeTime= ? ,pushStatus = 2 where financeCode = ? `,
+		//	eqCode, eqCode, specification, purpose, depreciation, yuanzhi,
+		//	salvage, subtractvalue, upkeepgrade, yearUpkeepCost, yearMaintainCost, baseHours, employeName, pasture.ID, employeName, pasture.ID, inputUser, leaveDate,
+		//	brandInfo.BrandName, brandInfo.ID, provider.ID, provider.ProviderName, eqName, v[1], v[3], maintenance, pasture.ID, levelone, pasture.ID,
+		//	leveltwo, pasture.ID, levelthree, pasture.ID, onepushTime, twopushTime, threepushTime, financeCode).Error
 		if err != nil {
 			data["pasture"] = v[0]
 			data["eqName"] = eqName

cmd/conf/app.ini

@@ -72,7 +72,7 @@ EasUrl = http://60.174.151.11:6888
 
 [database]
 DsnDsn = eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc=Local
-; ####DsnDsn = root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eq230508?charset=utf8&parseTime=True&loc=Local
+; ####DsnDsn = root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eqmn?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = eq:Xdmy@1234@tcp(192.168.63.42:3306)/eq?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = root:root@tcp(127.0.0.1:3309)/test?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = root:root@tcp(192.168.1.93:3326)/eqdev?charset=utf8&parseTime=True&loc=Local
@@ -83,7 +83,7 @@ Type = mysql
 #User = root
 #Password = kepaiteng!QAZ
 #Host = 222.73.129.15:31306
-#Name = eq230508
+#Name = eqmn
 
 #####线上
 User = eq

cmd/conf/conf.toml

@@ -1,6 +1,6 @@
 [db]
 #dsn = "root:root@tcp(127.0.0.1:3309)/test?charset=utf8&parseTime=True&loc=Local"
-#dsn = "root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eq230508?charset=utf8&parseTime=True&loc=Local"
+#dsn = "root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eqmn?charset=utf8&parseTime=True&loc=Local"
 dsn = "eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc=Local"
 #dsn = "eq:Xdmy@1234@tcp(192.168.63.42:3306)/eq?charset=utf8&parseTime=True&loc=Local"
 #dsn = "root:root@tcp(192.168.1.93:3326)/eqdev?charset=utf8&parseTime=True&loc=Local"