更新

services/erp/erp.go

@@ -741,6 +741,60 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error
 	return nil
 }
 
+//周委外
+func GetWeiWaiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (err error) {
+	engine := db.Eloquent.Master()
+	session := engine.NewSession()
+	defer session.Close()
+
+	dao_SalesOrder := dal_base.NewSalesOrderDAO(session, PlantNr, UserId)
+	dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_ProductType.NewPredicate(grmi.Equal, "WW")})
+	FilerString := ""
+	FilerString += "FDocumentStatus = 'C' and FCancelStatus='A'"
+	dataList := utilService.SUB_SUBREQORDERInit().Search(FilerString, "")
+	if err = session.Begin(); err != nil {
+		return
+	}
+	fmt.Println(dataList)
+
+	for _, info := range dataList {
+		ArtId := info[0].(string)
+		Qty := info[1].(float64)
+		if Qty == 0 {
+			continue
+		}
+		OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation)
+		billNoOrigin := info[3].(string)
+		rowId := info[4].(string)
+
+		OrderId := "WW" + "_" + billNoOrigin + "_" + rowId
+		//fmt.Println(OrderId)
+		Time := utils.WeekDayMondayZeroTs(OriginTime)
+		timeNow := time.Now()
+		if OriginTime.Before(timeNow) {
+			Time = utils.WeekDayMondayZeroTs(timeNow)
+		}
+		SalesOrder := model.SalesOrder{
+			PlantNr: PlantNr,
+			OrderId: OrderId,
+			ArtId:   ArtId,
+			//Descr:   articleInfo.Descr1,
+			//FMaterialId: FMaterialId,
+			ExpectedDeliveryDate: grmi.Date(OriginTime),
+			RecieveTime:          grmi.DateTime(Time),
+			PlanQty:              Qty,
+			ProductType:          "WW",
+		}
+		err := dao_SalesOrder.InsertOne(&SalesOrder)
+		if err != nil {
+			fmt.Println(err)
+		}
+	}
+
+	_ = session.Commit()
+	return nil
+}
+
 //周在制
 func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (err error) {
 	engine := db.Eloquent.Master()

task/importWeiWai/main.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"fmt"
+	"leit.com/LAPP_CHEERSSON_BACKEND/task"
+)
+
+func main() {
+	err := task.EtlTaskInit()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	task.ImportWeiWai()
+	fmt.Println("OK")
+	return
+}

task/k3cloud.go

@@ -126,6 +126,12 @@ func ImportQichu() {
 	erp.GetQiChuQty(model.PlantNr, "system", &alldata_Article)
 }
 
+func ImportWeiWai() {
+	impl := implments.NewBalanceServiceImplement()
+	alldata_Article := impl.GetGlobalArticleData()
+	erp.GetWeiWaiWeekQty(model.PlantNr, "system", &alldata_Article)
+}
+
 func ImportZhaizhi() {
 	impl := implments.NewBalanceServiceImplement()
 	alldata_Article := impl.GetGlobalArticleData()

utils/k3cloud/service/SUB_SUBREQORDER.go

@@ -8,17 +8,18 @@ import (
 
 type SUB_SUBREQORDERService struct {
 	*utils2.K3config
-	FormID string
-	FieldKeys string
+	FormID     string
+	FieldKeys  string
 	FUseOrgKey string
 }
+
 //委外在制量
 func SUB_SUBREQORDERInit() *SUB_SUBREQORDERService {
 	voucher := &SUB_SUBREQORDERService{
-		K3config: utils2.K3Obj,
-		FormID:   "SUB_SUBREQORDER",
-		FieldKeys: "FMaterialId.FNumber,FNoStockInQty",
-		FUseOrgKey: "",
+		K3config:   utils2.K3Obj,
+		FormID:     "SUB_SUBREQORDER",
+		FieldKeys:  "FMaterialId.FNumber,FNoStockInQty,FPlanFinishDate,FBillNo,FRowId",
+		FUseOrgKey: "1=1 ",
 	}
 	return voucher
 }
@@ -26,11 +27,11 @@ func SUB_SUBREQORDERInit() *SUB_SUBREQORDERService {
 /**
 凭证写入
 */
-func (_this *SUB_SUBREQORDERService) Search( FilterString, OrderString string) [][]interface{} {
+func (_this *SUB_SUBREQORDERService) Search(FilterString, OrderString string) [][]interface{} {
 	var data [][]interface{}
-	if FilterString != ""{
-		FilterString = _this.FUseOrgKey+" And "+FilterString
-	}else{
+	if FilterString != "" {
+		FilterString = _this.FUseOrgKey + " And " + FilterString
+	} else {
 		FilterString = _this.FUseOrgKey
 	}
 	request := request2.SearchRequest{