正式发运单也可以删除 删除添加状态校验 只有2-状态的发运单可以删除

services/jit/implments/ShipOrder.service.impl.go

@@ -153,6 +153,7 @@ func (impl *ShipOrderServiceImplement) DeleteOne(user *global.User, shipOrderId
 		return grmi.NewBusinessError("开始事务失败, error:" + err.Error())
 	}
 	dao := dal.NewShipOrderDAO(session, user.PlantNr, user.UserId)
+	statusDao := dal.NewShipOrderStatusDAO(session, user.PlantNr, user.UserId)
 	itemDao := dal.NewShipOrderItemLstDAO(session, user.PlantNr, user.UserId)
 	dataLstDao := dal.NewShipOrderDataLstDAO(session, user.PlantNr, user.UserId)
 	record, err := dao.SelectOne(shipOrderId)
@@ -164,9 +165,22 @@ func (impl *ShipOrderServiceImplement) DeleteOne(user *global.User, shipOrderId
 		_ = session.Rollback()
 		return grmi.NewBusinessError("不存在指定记录!")
 	}
-	if record.ShipType != model.SHIP_TYPE_ADVANCE {
+	//if record.ShipType != model.SHIP_TYPE_ADVANCE {
+	//	_ = session.Rollback()
+	//	return grmi.NewBusinessError("该发运单不是预发运单，不允许删除")
+	//}
+	status, err := statusDao.SelectOne(shipOrderId)
+	if err != nil {
+		_ = session.Rollback()
+		return grmi.NewBusinessError("查询发运单状态失败, error:" + err.Error())
+	}
+	if status == nil {
+		_ = session.Rollback()
+		return grmi.NewBusinessError("未查询到状态数据")
+	}
+	if status.Status != model.SHIP_STATUS_PLANNED {
 		_ = session.Rollback()
-		return grmi.NewBusinessError("该发运单不是预发运单，不允许删除")
+		return grmi.NewBusinessError("发运单状态不是未开始，不允许删除")
 	}
 	err = dao.DeleteOne(shipOrderId)
 	if err != nil {