Merge pull request '金蝶更新' (#228) from feature_jindie into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/228

services/ap/implments/PlanOrderVersion.service.impl.go

@@ -133,7 +133,6 @@ func (impl *PlanOrderVersionServiceImplement) Publish(info utils.ChannelsInfo) (
 	entity, ok := info.Info.(model.PlanOrderVersion)
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
-	defer session.Close()
 	defer func() { //在panic前声明defer,能捕获异常
 		if err := recover(); err != nil {
 			innerLog, _ := logger.NewLogger("system", "planOrderVersion_cancel")
@@ -146,12 +145,16 @@ func (impl *PlanOrderVersionServiceImplement) Publish(info utils.ChannelsInfo) (
 	dao := dal.NewPlanOrderVersionDAO(session, entity.PlantNr, "system")
 	entity.Status = 40
 	_ = dao.UpdateOne(&entity)
+	_ = session.Commit()
 	detailDao := dal.NewPlanOrderDAO(session, entity.PlantNr, "system")
 	detailList, err := detailDao.Select([]grmi.Predicate{
 		meta.PlanOrder_PlanOrderId.NewPredicate(grmi.Equal, entity.PlanOrderId),
 		meta.PlanOrder_Operator.NewPredicate(grmi.Equal, ""),
 	}, nil)
 	if err != nil {
+		entity.Status = 101
+		_ = dao.UpdateOne(&entity)
+		_ = session.Commit()
 		panic(err)
 	}
 	//TODO

services/erp/erp.go

@@ -454,7 +454,8 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
 	//	FilerString += "FMaterialId = " + FMaterialIdS
 	//}
 	FilerString += "FDocumentStatus = 'C'"
-	dataList := utilService.SaleOrderInit_Dingdanxuqiu().SaleOrderSearch(FilerString, "")
+	sFilerString := FilerString + " and FCloseStatus='A' and FMrpCloseStatus='A' and FChangeFlag IN('D','N','C')"
+	dataList := utilService.SaleOrderInit_Dingdanxuqiu().SaleOrderSearch(sFilerString, "")
 	dataList2 := utilService.SAL_XORDERInit_Dingdanxuqiu().SAL_XORDERSearch(FilerString, "")
 
 	billMap := make(map[string]map[int]float64)
@@ -480,6 +481,9 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
 			if billNoOrigin == billList[0] {
 				changeMap[number] = Qty
 			}
+			if utils.ValueToString(v[5], "") == "B" || utils.ValueToString(v[6], "") == "B" {
+				changeMap[number] = 0
+			}
 		}
 		billMap[billNoOrigin+"["+utils.ValueToString(v[6], "")+"]"+"["+utils.ValueToString(v[0], "")+"]"] = changeMap
 	}

utils/k3cloud/service/PLN_PLANORDER.go

@@ -120,7 +120,7 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 				FNumber: article.UomId,
 			},
 			FPlanStartDate:  articleDemand.PlanDate.ToString(),
-			FPlanFinishDate:saturday.ToString(),
+			FPlanFinishDate: saturday.ToString(),
 			FFirmQty:        int(articleDemand.PlanQty),
 			FFirmStartDate:  articleDemand.PlanDate.ToString(),
 			FFirmFinishDate: saturday.ToString(),

utils/k3cloud/service/PRD_MO.go

@@ -40,7 +40,7 @@ func PRD_MO_Init_Duli() *PRD_MO_Service {
 		K3config:   utils.K3Obj,
 		FormID:     "PRD_MO",
 		FieldKeys:  "FMaterialId.FNumber,FNoStockInQty,FPlanFinishDate,FBillType.FNumber",
-		FUseOrgKey: "FPrdOrgId=" + utils.K3Obj.FUseOrgId + " And FReqType = 2",
+		FUseOrgKey: "FPrdOrgId=" + utils.K3Obj.FUseOrgId + " And FReqType = 2 And FCancelStatus='A' ",
 	}
 	return voucher
 }

utils/k3cloud/service/SAL_XORDER.go

@@ -16,8 +16,8 @@ func SAL_XORDERInit_Dingdanxuqiu() *SAL_XORDERService {
 	cust := &SAL_XORDERService{
 		K3config:   utils.K3Obj,
 		FormID:     "SAL_XORDER",
-		FieldKeys:  "FMaterialId.FNumber,FDeliRemainQty,FPlanDate,FBillNo,FChangeType",
-		FUseOrgKey: "FStockOrgId=" + utils.K3Obj.FUseOrgId + " or FStockOrgId = "+ utils.K3Obj.FUseOrgId2,
+		FieldKeys:  "FMaterialId.FNumber,FDeliRemainQty,FPlanDate,FBillNo,FChangeType,FCloseStatus,FMrpCloseStatus",
+		FUseOrgKey: "FStockOrgId=" + utils.K3Obj.FUseOrgId + " or FStockOrgId = " + utils.K3Obj.FUseOrgId2,
 	}
 	return cust
 }