更新

main.go

@@ -137,6 +137,6 @@ func imain() {
 	// 开启自动创建功能
 	go createVersion.CreateVersionTask()
 	//启动监听端口
-	app.Run(iris.Addr(":9001"), iris.WithConfiguration(conf.C))
+	app.Run(iris.Addr(":9003"), iris.WithConfiguration(conf.C))
 
 }

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

@@ -3980,12 +3980,14 @@ func (impl *CustDemandVerHeadServiceImplement) IssueGlobalAllVersion(user *globa
 		{
 			//查询客户下面的销售订单组成
 			var salesOrder []baseModel.SalesOrder
-			if err := session.SQL("SELECT * FROM SalesOrder WHERE CustomerId = ? and ExpectedDeliveryDate > ?", v.CustomerId, nowDay).Find(&salesOrder); err != nil {
+			if err := session.SQL("SELECT * FROM SalesOrder WHERE CustomerId = ? ", v.CustomerId).Find(&salesOrder); err != nil {
 				session.Rollback()
 				return err
 			}
 
 			for _, v := range salesOrder {
+				dnowWeek, dyear, _ := utils.WeekByDate(v.ExpectedDeliveryDate.Restore())
+
 				if info, ok := salesOrderMap[v.ArtId]; !ok {
 					salesOrderMap[v.ArtId] = make(map[string]int)
 					detailList = append(detailList, model.CustDemandVerDetail{
@@ -4000,7 +4002,9 @@ func (impl *CustDemandVerHeadServiceImplement) IssueGlobalAllVersion(user *globa
 					if v.CtrlStr1 == nowVersionId {
 						continue
 					}
-					dnowWeek, dyear, _ := utils.WeekByDate(v.ExpectedDeliveryDate.Restore())
+					if dyear < year || (dyear == year && dnowWeek < nowWeek) {
+						continue
+					}
 					detailList = append(detailList, model.CustDemandVerDetail{
 						DemandDate: v.ExpectedDeliveryDate,
 						ArtId:      v.ArtId,
@@ -4022,8 +4026,10 @@ func (impl *CustDemandVerHeadServiceImplement) IssueGlobalAllVersion(user *globa
 						})
 						salesOrderMap[v.ArtId][nowVersionId] = 1
 					}
+					if dyear < year || (dyear == year && dnowWeek < nowWeek) {
+						continue
+					}
 					if _, _ok := info[v.CtrlStr1]; !_ok {
-						dnowWeek, dyear, _ := utils.WeekByDate(v.ExpectedDeliveryDate.Restore())
 						detailList = append(detailList, model.CustDemandVerDetail{
 							DemandDate: v.ExpectedDeliveryDate,
 							ArtId:      v.ArtId,