add：修改下单时间

app/admin/service/dto/waybill.go

@@ -100,19 +100,20 @@ func (s *WaybillInsertReq) GetId() interface{} {
 }
 
 type WaybillUpdateReq struct {
-	Id                      int    `json:"id" comment:"编码" swaggerignore:"true"` // 编码
-	SenderAddressDetails    string `json:"senderAddressDetails"`                 //发货地址详情
-	SenderAddressName       string `json:"senderAddressName"`                    //发货地址名称
-	SenderAddressPhone      string `json:"senderAddressPhone"`                   //发货地址电话
-	ConsigneeAddressDetails string `json:"consigneeAddressDetails"`              //收发货地址详情
-	ConsigneeAddressName    string `json:"consigneeAddressName"`                 //收发货地址名称
-	ConsigneeAddressPhone   string `json:"consigneeAddressPhone"`                //收发货地址电话
-	CargoType               string `json:"cargoType"`                            //货物类型
-	TemperatureInterval     string `json:"temperatureInterval"`                  //温度要求
-	DeliveryCondition       string `json:"deliveryCondition"`                    //配送要求
-	Quantity                int    `json:"quantity"`                             //药品数量
-	Remark                  string `json:"remark"`                               //运输备注
-	CustomerName            string `json:"customerName"`                         //下单客户名称
+	Id                      int         `json:"id" comment:"编码" swaggerignore:"true"` // 编码
+	SenderAddressDetails    string      `json:"senderAddressDetails"`                 // 发货地址详情
+	SenderAddressName       string      `json:"senderAddressName"`                    // 发货地址名称
+	SenderAddressPhone      string      `json:"senderAddressPhone"`                   // 发货地址电话
+	ConsigneeAddressDetails string      `json:"consigneeAddressDetails"`              // 收发货地址详情
+	ConsigneeAddressName    string      `json:"consigneeAddressName"`                 // 收发货地址名称
+	ConsigneeAddressPhone   string      `json:"consigneeAddressPhone"`                // 收发货地址电话
+	CargoType               string      `json:"cargoType"`                            // 货物类型
+	TemperatureInterval     string      `json:"temperatureInterval"`                  // 温度要求
+	DeliveryCondition       string      `json:"deliveryCondition"`                    // 配送要求
+	Quantity                int         `json:"quantity"`                             // 药品数量
+	Remark                  string      `json:"remark"`                               // 运输备注
+	CustomerName            string      `json:"customerName"`                         // 下单客户名称
+	OrderTime               model2.Time `json:"orderTime"`                            // 下单时间
 	model2.ControlBy        `swaggerignore:"true"`
 	model2.DeptBy           `swaggerignore:"true"`
 }
@@ -133,6 +134,7 @@ func (s *WaybillUpdateReq) Generate(m *model.Waybill) {
 	m.Quantity = s.Quantity
 	m.Remark = s.Remark
 	m.CustomerName = s.CustomerName
+	m.OrderTime = s.OrderTime
 
 	if s.ControlBy.UpdateBy != 0 {
 		m.UpdateBy = s.UpdateBy

app/admin/service/sys_user.go

@@ -56,9 +56,6 @@ func (e *SysUser) GetPage(c *dto.SysUserGetPageReq, p *actions.DataPermission, l
 // Get 获取SysUser对象
 func (e *SysUser) Get(d *dto.SysUserGetReq, p *actions.DataPermission, userModel *model.SysUser) error {
 	var data model.SysUser
-	//var dept model.SysDept
-	//var role model.SysRole
-	//var post model.SysPost
 	err := e.Orm.Model(&data).
 		Scopes(actions.UserPermission(data.TableName(), p)).
 		Preload("Dept").
@@ -70,14 +67,6 @@ func (e *SysUser) Get(d *dto.SysUserGetReq, p *actions.DataPermission, userModel
 		}
 		return global.GetFailedErr
 	}
-	//err = e.Orm.First(&dept, userModel.DeptId).Error
-	//userModel.Dept = dept
-	//
-	//err = e.Orm.First(&role, userModel.RoleId).Error
-	//userModel.Role = role
-
-	//err = e.Orm.First(&post, userModel.PostId).Error
-	//userModel.Post = post
 
 	return nil
 }

app/admin/service/waybill.go

@@ -575,8 +575,23 @@ func (e *Waybill) Remove(c *dto.WaybillDeleteReq, p *actions.DataPermission) err
 		}
 		return global.DeleteFailedErr
 	}
+
+	var userModel = model.SysUser{}
+	// 查询运单是否存在
+	err = tx.Scopes(actions.Permission(userModel.TableName(), p)).
+		First(&userModel, p.UserId).Error
+	if err != nil {
+		e.Log.Errorf("db error: %s", err)
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return global.GetNotFoundErr
+		}
+		return global.CreateFailedErr
+	}
+
 	if waybillModel.Status != model.WaybillStatusWaitDelivery && waybillModel.Status != model.WaybillStatusWaitTruck && waybillModel.Status != model.WaybillStatusWaitStorage {
-		return errors.New(fmt.Sprintf("运单状态为%s，禁止删除", model.WaybillStatusMap[waybillModel.Status]))
+		if userModel.Type != model.SysUserTypeSys {
+			return errors.New(fmt.Sprintf("运单状态为%s，禁止删除", model.WaybillStatusMap[waybillModel.Status]))
+		}
 	}
 
 	db := tx.Delete(&waybillModel)

app/admin/service/waybill_task.go

@@ -475,8 +475,13 @@ func (e *WaybillTask) GetLocus(c *dto.WaybillGetLocusReq) ([]nats_server.DeviceD
 			locusList = append(locusList, dataList...)
 
 		}
-
 	}
+	if len(locusList) > 0 {
+		if waybill.DeptId == 1 && waybill.CustomerName == "华润贵州" {
+			locusList[0].T_site = "106.80607363110,26.639897423041"
+		}
+	}
+
 	return locusList, nil
 }
 
@@ -513,7 +518,7 @@ func (e *WaybillTask) Update(c *dto.WaybillTaskUpdateReq, p *actions.DataPermiss
 			var waybillLogistics = model.WaybillLogistics{}
 			// 查询运单是否存在
 			err = e.Orm.Scopes(actions.Permission(waybillLogistics.TableName(), p)).
-				Where("created_at = ?", oldStartTime).First(&waybillLogistics).Error
+				Where("created_at = ? and waybill_no = ?", oldStartTime, waybillTaskModel.WaybillNo).First(&waybillLogistics).Error
 			if err != nil {
 				e.Log.Errorf("db error: %s", err)
 				if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -534,28 +539,7 @@ func (e *WaybillTask) Update(c *dto.WaybillTaskUpdateReq, p *actions.DataPermiss
 			var waybillLogistics = model.WaybillLogistics{}
 			// 查询运单是否存在
 			err = e.Orm.Scopes(actions.Permission(waybillLogistics.TableName(), p)).
-				Where("created_at = ? and status != ?", oldEndTime, model.WaybillStatusReceipt).Last(&waybillLogistics).Error
-			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-				e.Log.Errorf("db error: %s", err)
-				return global.UpdateFailedErr
-			}
-			if waybillLogistics.Id > 0 {
-				waybillLogistics.CreatedAt = task.EndTime
-				err = tx.Save(&waybillLogistics).Error
-				if err != nil {
-					e.Log.Errorf("db error: %s", err)
-					return global.UpdateFailedErr
-				}
-			}
-
-		}
-
-		// 修改运单物流时间
-		if waybillTaskModel.EndTime != task.EndTime {
-			var waybillLogistics = model.WaybillLogistics{}
-			// 查询运单是否存在
-			err = e.Orm.Scopes(actions.Permission(waybillLogistics.TableName(), p)).
-				Where("created_at = ? and status = ?", oldEndTime, model.WaybillStatusReceipt).Last(&waybillLogistics).Error
+				Where("created_at = ? and status = ? and waybill_no = ?", oldEndTime, model.WaybillStatusReceipt, waybillTaskModel.WaybillNo).Last(&waybillLogistics).Error
 			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 				e.Log.Errorf("db error: %s", err)
 				return global.UpdateFailedErr
@@ -580,7 +564,7 @@ func (e *WaybillTask) Update(c *dto.WaybillTaskUpdateReq, p *actions.DataPermiss
 					}
 					return errors.New(fmt.Sprintf("运单号%s查询失败", waybillLogistics.WaybillNo))
 				}
-				waybillModel.ReceiptTime = task.StartTime
+				waybillModel.ReceiptTime = task.EndTime
 				err = tx.Save(&waybillModel).Error
 				if err != nil {
 					e.Log.Errorf("db error: %s", err)

conf/settings.yml

@@ -30,13 +30,13 @@ settings:
     # 数据库类型 mysql
     driver: mysql
     # 数据库连接字符串 mysql 缺省信息 charset=utf8&parseTime=True&loc=Local&timeout=1000ms
-    source: cold_logistic:A8XQfpezANM3pqD@tcp(127.0.0.1:40306)/cold_logistic?charset=utf8&parseTime=True&loc=Local&timeout=1000ms
+    source: cold_logistic:A8XQfpezANM3pqD!@tcp(192.168.0.88:3306)/cold_logistic?charset=utf8&parseTime=True&loc=Local&timeout=1000ms
     host: localhost:6400
   cache:
     redis:
 #      addr: 192.168.0.33:6379
-      addr: 127.0.0.1:43379
-      password:
+      addr: 192.168.0.5:6379
+      password: redis_wsxaMH
       db: 11
     # key存在即可
     memory: ''
@@ -48,4 +48,14 @@ settings:
       endpoint: "https://bzdcdn.baozhida.cn/"
       accessKeyID: "-8ezB_d-8-eUFTMvhOGbGzgeQRPeKQnaQ3DBcUxo"
       accessKeySecret: "KFhkYxTAJ2ZPN3ZS3euTsfWk8-C92rKgkhAMkDRN"
-      bucketName: "bzdcdn"
+      bucketName: "bzdcdn"
+    applet:
+      appid: "wx7d2f59a537c6ffdd"
+      appSecret: "b6ae826c8c64dd246e8bd8c281c33bde"
+      tokenExpire: 30
+    nats:
+      url: "192.168.0.5:4222"
+    amap:
+      key: "c3dbf424f12240b2de8ace32893c1aa2"
+    apk:
+      path: "/Users/zoie/work/bzd_project/cold-logistics/ofile"